Skip to content

C
core
Kaydet (Commit) 1e9f373e authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

serialize all unit tests runs with icecream_run. 

Change-Id: Iaed997a4c9a36d618934c5870c65c3006c44561d
üst 9c17f2b2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
solenv/gbuild/CppunitTest.mk
Dosyayı görüntüle @ 1e9f373e
...@@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true) ...@@ -40,7 +40,7 @@ gb_CppunitTest__interactive := $(true)
endif endif
ifneq ($(strip $(VALGRIND)),) 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) ifeq ($(strip $(VALGRIND)),memcheck)
G_SLICE := always-malloc G_SLICE := always-malloc
GLIBCXX_FORCE_NEW := 1 GLIBCXX_FORCE_NEW := 1
...@@ -91,7 +91,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET) ...@@ -91,7 +91,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
DISABLE_SAL_DBGBOX=t \ DISABLE_SAL_DBGBOX=t \
$(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \ $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \ 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_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) \
$(call gb_CppunitTest__make_args) \ $(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false)))) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment