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

[Stephan Bergmann]

 solenv/gbuild/CppunitTest.mk |    4 ++--
 solenv/gbuild/gbuild.mk      |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 627a2fa0a75f7920df6d5e5d5c75accb118f1956
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 22 15:31:41 2016 +0100

    Exit gb_CppunitTest_localized loop on first failure
    
    ...instead of ignoring failures in every but the last iteration
    
    Change-Id: Ie80e78f75aaec5e9b1625c2e1ef740adf31fab1b

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 63317d8..95f5fbc 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -110,7 +110,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
 			$(if $(value gb_CppunitTest_postprocess), \
 				rm -fr $@.core && mkdir $@.core && cd $@.core &&)) \
 		( \
-		$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \
+		$(if $(gb_CppunitTest_localized),$(OPEN_PAREN)for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \
 		$(if $(filter gdb,$(CPPUNITTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
@@ -121,7 +121,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
 		$(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) "-env:CPPUNITTESTTARGET=$@" \
-		$(if $(gb_CppunitTest_localized), ;done ) \
+		$(if $(gb_CppunitTest_localized),|| exit $$?; done$(CLOSE_PAREN)) \
 		$(if $(gb_CppunitTest__interactive),, \
 			> $@.log 2>&1 \
 			|| ($(if $(value gb_CppunitTest_postprocess), \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f053107..747c1d6 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -57,6 +57,7 @@ endef
 
 COMMA :=,
 
+OPEN_PAREN :=(
 CLOSE_PAREN :=)
 
 gb_VERBOSE := $(verbose)