diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-12-18 16:25:07 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-19 11:24:27 +0000 |
| commit | 1e9f373e35fd54e5cca4bf1eb5bf86230264d235 (patch) | |
| tree | 3a28d650ff156011396fe821967e133edba4a68d /solenv/gbuild/CppunitTest.mk | |
| parent | 9c17f2b24bc97b46640b1728fb04d65b88c09f75 (diff) | |
serialize all unit tests runs with icecream_run.
Change-Id: Iaed997a4c9a36d618934c5870c65c3006c44561d
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 6ea7f2716144..55d11813ebb6 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true) endif ifneq ($(strip $(VALGRIND)),) -gb_CppunitTest_VALGRINDTOOL := $(ICECREAM_RUN) valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 --quiet --leak-check=no +gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 --quiet --leak-check=no ifeq ($(strip $(VALGRIND)),memcheck) G_SLICE := always-malloc GLIBCXX_FORCE_NEW := 1 @@ -91,7 +91,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET) DISABLE_SAL_DBGBOX=t \ $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \ STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \ - $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \ + $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \ $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) \ $(call gb_CppunitTest__make_args) \ $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false)))) |