[Libreoffice-commits] core.git: desktop/scripts solenv/gbuild

[Libreoffice Gerrit user]

 desktop/scripts/soffice.sh   |    3 ++-
 solenv/gbuild/CppunitTest.mk |    7 ++++++-
 solenv/gbuild/PythonTest.mk  |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit ad6286ce92e7536f0aec9fd1bd9e2eec8ccc21bf
Author:     Michael Stahl <mstahl at redhat.com>
AuthorDate: Wed May 20 13:18:42 2015 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Sep 5 16:01:07 2018 +0200

    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 at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>

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."
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1ac3b210e149..8e130d481802 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -63,6 +63,10 @@ gb_CppunitTest_VALGRINDTOOL += --vgdb=yes --vgdb-error=0
 endif
 endif
 
+ifneq ($(strip $(RR)),)
+gb_CppunitTest_RR := rr record
+endif
+
 # defined by platform
 #  gb_CppunitTest_get_filename
 gb_CppunitTest_RUNTIMEDEPS := $(call gb_Executable_get_runtime_dependencies,cppunittester)
@@ -134,7 +138,8 @@ else
 		$(gb_CppunitTest_malloc_check) \
 		$(if $(strip $(PYTHON_URE)),\
 			PYTHONDONTWRITEBYTECODE=1) \
-		$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
+		$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
+			$(gb_CppunitTest_CPPTESTCOMMAND) \
 		$(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \
 		$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
 		$(if $(gb_CppunitTest_POSTGDBTRACE), \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index c579a34ea6d5..a2bac3819e02 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -55,7 +55,7 @@ else
 		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \
 			SAL_USE_VCLPLUGIN=svp \
 		)) \
-		$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \
+		$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
 			$(gb_PythonTest_COMMAND) \
 			$(if $(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \
 		$(if $(gb_CppunitTest__interactive),, \