diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-25 11:32:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-25 14:16:27 +0100 |
| commit | d0f4740843a052cd444efbd142ef2b66e233ddb9 (patch) | |
| tree | 33ca88dd0088a4d8082c45e557eba1ef5181dff0 /solenv | |
| parent | adf4a7a8b39d17841de70fa0b43b525a991a45ab (diff) | |
Revert "Use { ... } for grouping that does not need a sub-shell"
This reverts commit 51f4691e7f4f3bceac1d5ec9cbbf37de7e71e471. The
gb_CppunitTest_localized case did need the sub-shell for its
$(if $(gb_CppunitTest_localized),|| exit $$?; done) \
part, or else a failed sub-command would exit the whole recipe line and suppress
the non-gb_CppunitTest__interactive postprocessing part.
Change-Id: I115388ce4fe834f73ebd0abf2591775189c0121b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108280
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -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 9d32cc2533ca..a296ef73a932 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -130,7 +130,7 @@ else $(if $(gb_CppunitTest__interactive),, \ $(if $(value gb_CppunitTest_postprocess), \ rm -fr $@.core && mkdir $@.core && cd $@.core &&)) \ - { \ + ( \ $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do \ printf 'LO_TEST_LOCALE=%s\n' "$$l" && LO_TEST_LOCALE="$$l" ) \ $(if $(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \ @@ -149,7 +149,7 @@ else $(if $(gb_CppunitTest_POSTGDBTRACE), \ ; RET=$$? && $(gb_CppunitTest_POSTGDBTRACE) && (exit $$RET)) \ $(if $(gb_CppunitTest_localized),|| exit $$?; done) \ - ; } \ + ) \ $(if $(gb_CppunitTest__interactive),, \ > $@.log 2>&1 \ || ($(if $(value gb_CppunitTest_postprocess), \ |