[Libreoffice-commits] core.git: smoketest/CppunitTest_smoketest.mk solenv/gbuild

[Stephan Bergmann]

 smoketest/CppunitTest_smoketest.mk |    2 --
 solenv/gbuild/CppunitTest.mk       |    7 -------
 2 files changed, 9 deletions(-)

New commits:
commit b5a680c5de114dd6d0ea4ab29715c2bcff2b1ec4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 31 13:43:34 2014 +0200

    SAL_DIAGNOSE_ABORT is no longer used
    
    Change-Id: I87090e2714bca3ea7a9ad8a8ff966702139ba345

diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 5909c30..d245290 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -10,8 +10,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,smoketest))
 
-$(eval $(call gb_CppunitTest_abort_on_assertion,smoketest))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\
 	smoketest/smoketest_too \
 ))
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 9b012bc..7d2b602 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -77,7 +77,6 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
 		($(gb_CppunitTest_CPPTESTPRECOMMAND) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
-		$(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
 		$(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) \
@@ -118,18 +117,12 @@ $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS :=
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
 $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
-$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT :=
 $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless
 $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest)
 
 endef
 
-define gb_CppunitTest_abort_on_assertion
-$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := TRUE
-
-endef
-
 # Add additional command line arguments for the test.
 #
 # You should practically never need to use this, as there are special