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 50ea40ec905ed8c1a18b714b475b3f8be973e81e..6cbb85a9ee0158de5f0ae60fcb03201b2b5cfc02 100644 (file)
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -50,11 +50,7 @@ endif
                && printf 'yes\n' | LC_ALL=C make \
                        CC="$(CXX)" LINK="$(CXX)" LIB="$(CXX)" \
                    $(if $(MACOSX_SHELL_HACK), SHELL=$(ODK_BUILD_SHELL), )))) \
-           >$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
-       || (RET=$$$$? \
-           $(if $(MACOSX_SHELL_HACK), && rm -f $(ODK_BUILD_SHELL) , ) \
-           && cat $(call gb_CustomTarget_get_workdir,$(1))/log \
-           && exit $$$$RET)
+           2>&1
 ifneq ($(MACOSX_SHELL_HACK),)
        -rm -f $(ODK_BUILD_SHELL)
 endif

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f2a267e3e04b9ce4b925c614f7c8d479467148fc..ab2d0d566812cc9c04080a478e9ddc62379282c9 100644 (file)
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -139,12 +139,7 @@ else
                        ; RET=$$? && $(gb_CppunitTest_POSTGDBTRACE) && (exit $$RET)) \
                $(if $(gb_CppunitTest_localized),|| exit $$?; done) \
                ) \
-               $(if $(gb_CppunitTest__interactive),, \
-                       > $@.log 2>&1 \
-                       || ($(if $(value gb_CppunitTest_postprocess), \
-                                       RET=$$?; \
-                                       $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \
-                               cat $@.log; $(gb_CppunitTest_UNITTESTFAILED) Cppunit $*)))
+               2>&1)
 endif
 
 define gb_CppunitTest_CppunitTest

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 2102d196d58cc3bdea729ad7dba65f32e570f310..a42646eb532d34f69c556b6e37f46ff1a32136a0 100644 (file)
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -44,17 +44,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)
 endif
 

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 16bc7d2404a786dd028ef9991c620d5f5956957c..e27eabe178b4f0091b65a30746e31c6b69b635eb 100644 (file)
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -59,12 +59,7 @@ else
                $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
                        $(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))
 endif
 
 # always use udkapi and URE services

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 5ae6774b7d8d6e1f27d2bd28225bfb996b4ae3e5..5519651bd31529d85e72fabee44b811285254484 100644 (file)
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -78,16 +78,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))
 endif
 
 # always use udkapi and URE services