solenv/gbuild/CppunitTest.mk | 7 +------
solenv/gbuild/PythonTest.mk | 3 +--
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 297680e88e97ce2940b3e38c0cdfeec5c061daca
Author: Michael Stahl <mst...@redhat.com>
Date: Fri May 22 00:01:11 2015 +0200
Revert "gbuild: allow recording of CppunitTests and PythonTests too"
This reverts commit 5a7816b971c51ea4b642738a065e90d4d9bf12d7.
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e2d8e3f..021ecc8 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -39,10 +39,6 @@ $(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running
performance tests with e
gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes
--instr-atstart=no
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)
@@ -103,8 +99,7 @@ $(call gb_CppunitTest_get_target,%) :|
$(gb_CppunitTest_RUNTIMEDEPS)
$(if $(HEADLESS),,VCL_HIDE_WINDOWS=1) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
- $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
- $(gb_CppunitTest_CPPTESTCOMMAND) \
+ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,$(call
gb_CppunitTest_get_linktarget,$*)) \
$(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),, \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index d093d38..ce5f5ed 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -52,8 +52,7 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
UserInstallation=$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*))user) \
TestUserDir="$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
- $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL)
$(gb_CppunitTest_RR) \
- $(gb_PythonTest_COMMAND) \
+ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL)
$(gb_PythonTest_COMMAND) \
$(MODULES) \
$(if $(gb_CppunitTest__interactive),, \
> $@.log 2>&1 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
