do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff

diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 9f608e5d196a37468c6b76677024b62c4ebf8d5e..54cb77f9cc03c14cb056fd07b98d692ad8c8962a 100644 (file)
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -49,12 +49,7 @@ else
                && printf 'yes\n' | LANGUAGE= LC_ALL=C make -j1 \
                        CC="$(CXX) $(gb_CXX03FLAGS)" LINK="$(CXX)" LIB="$(CXX)" \
                    $(if $(MACOSX_SHELL_HACK), SHELL="$$$$ODK_BUILD_SHELL", ))) \
-       $(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$ODK_BUILD_SHELL")) \
-           >$(gb_CustomTarget_workdir)/$(1)/log 2>&1 \
-       || (RET=$$$$? \
-           $(if $(MACOSX_SHELL_HACK), && rm -f "$$$$ODK_BUILD_SHELL" , ) \
-           && cat $(gb_CustomTarget_workdir)/$(1)/log \
-           && exit $$$$RET)
+       2>&1 )
 endif
 
 $(gb_CustomTarget_workdir)/$(1)/setsdkenv: \

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 7ff3caec5f3161e591ff25a94409de174e6acbf4..4aa0bd66c9db00527c27e0e1ec7c13823027c642 100644 (file)
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -160,12 +160,7 @@ else
                $(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
                ) \
                $(if $(gb_CppunitTest__interactive),$(if $(gb_CppunitTest_localized),|| exit $$?), \
-                       > $@.$(if $(gb_CppunitTest_localized),$$l.)log 2>&1 \
-                       || { $(if $(value gb_CppunitTest_postprocess), \
-                                       RET=$$?; \
-                                       $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.$(if $(gb_CppunitTest_localized),$$l.)log 2>&1;) \
-                               cat $@.$(if $(gb_CppunitTest_localized),$$l.)log; $(gb_CppunitTest_UNITTESTFAILED) Cppunit $*; \
-                               $(if $(gb_CppunitTest_localized),exit $$RET;) } ) \
+                       2>&1 ) \
                $(if $(gb_CppunitTest_localized),; done))
        $(call gb_Trace_EndRange,$*,CUT)
 endif

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 23f0a1fb0135e995ced55d070519f69799d247e1..fca133657ea5ec943ce4237e47b75e7b39ca4139 100644 (file)
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -47,17 +47,7 @@ else
             -classpath "$(T_CP)" \
             $(DEFS) \
             org.junit.runner.JUnitCore \
-            $(CLASSES) > $@.log 2>&1 || \
-               (cat $@.log \
-               && echo "to rerun just this failed test without all others, run:" \
-               && echo && echo "    make JunitTest_$*" && echo \
-               && echo "cd into the module dir to run the tests faster" \
-               && echo "Or to do interactive debugging, run two shells with:" \
-               && echo \
-               && echo "    make debugrun" \
-               && echo "    make gb_JunitTest_DEBUGRUN=T JunitTest_$*" \
-               && echo \
-               && false)))
+            $(CLASSES) 2>&1))
        $(CLEAN_CMD)
        $(call gb_Trace_EndRange,$*,JUT)
 endif

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 90d6f1d0f7027a2a4ce7a4b68c3a22517bee5d37..7947f3ea4c794bc3505f6f2fd933366470fa9e40 100644 (file)
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -67,12 +67,7 @@ else
                        $(gb_PythonTest_COMMAND) \
                        $(if $(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \
                ; } \
-               $(if $(gb_CppunitTest__interactive),, \
-                       > $@.log 2>&1 \
-                       || ($(if $(value gb_CppunitTest_postprocess), \
-                                       RET=$$?; \
-                                       $(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
-                               cat $@.log; $(gb_PythonTest_UNITTESTFAILED) Python $*)))
+               2>&1)
        $(call gb_Trace_EndRange,$*,PYT)
 endif
 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 328216d2c25944c0fdad8f9bf09b91abe31566f4..4a0ab49284e5e31b1fa8a3f1a4febd1a8889c407 100644 (file)
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -88,16 +88,7 @@ else
                --userdir=$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*))user) \
                --dir=$(strip $(MODULES)) \
                $(gb_UITest_GDBTRACE) \
-               $(if $(gb_UITest__interactive),, \
-                   > $@.log 2>&1 \
-                   || ($(if $(value gb_CppunitTest_postprocess), \
-                                   RET=$$?; \
-                                   $(call gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
-                $(if $(filter WNT,$(OS)), \
-                    printf '%s: <<<\n' $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \
-                    cat $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \
-                    printf ' >>>\n\n';) \
-                           cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*))))
+               2>&1))
        $(call gb_Trace_EndRange,$*,UIT)
 endif