summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-05-20 13:18:42 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-09-05 16:01:07 +0200
commitad6286ce92e7536f0aec9fd1bd9e2eec8ccc21bf (patch)
tree8fc2304b3b20a460c034a6e7b0c36f66a6e550eb /desktop
parent62bfe29f9045127d479c42376f599ddfb0fbb2ca (diff)
gbuild: allow recording of CppunitTests and PythonTests too
Since these don't use soffice they need to be tweaked to use RR variable. A rr git master build from some weeks ago can record all tests, except CppunitTest_dbaccess_firebird_test which fails. smoketest is a bit tricky because it spawns soffice which checks RR variable again and starts a nested rr, but fortunately there's a flag to prevent it from aborting in this situation. For UITests currently only the soffice.bin is recorded, not the python test process. The size of all the recording is about 35G per run in a --enable-dbgutil build. Change-Id: I2143618fa2181e36b6aaeded43637cb3481f5e47 Reviewed-on: https://gerrit.libreoffice.org/60032 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'desktop')
-rwxr-xr-xdesktop/scripts/soffice.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index df295cb76250..6f969b5af321 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -78,7 +78,8 @@ for arg in "$@" $EXTRAOPT ; do
case "$arg" in
--record)
if which rr >/dev/null 2>&1 ; then
- RRCHECK="rr record"
+ # smoketest may already be recorded => use ignore-nested
+ RRCHECK="rr record --ignore-nested"
checks="c$checks"
else
echo "Error: Can't find the tool \"rr\", --record option will be ignored."