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 abcb3a3e25933bd6ada0e59737f4860a601243c4..d069e5e8a0b2c8d3f26c50513daa3bb9995b74b4 100644 (file)
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -49,12 +49,7 @@ else
                && printf 'yes\n' | LC_ALL=C make \
                        CC="$(CXX)" LINK="$(CXX)" LIB="$(CXX)" \
                    $(if $(MACOSX_SHELL_HACK), SHELL="$$$$ODK_BUILD_SHELL", ))) \
-       $(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$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 )
 endif
 
 $(call gb_CustomTarget_get_workdir,$(1))/setsdkenv: \

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index efe39ed45a8d6f95f71da782d6ad3564e115e024..4473eb2957a9926af0e7f06a2ab0974df9be400c 100644 (file)
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -138,12 +138,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)
        $(call gb_Trace_EndRange,$*,CUT)
 endif
 

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 401c8ff5cd9740c463c4e864c6af56c2a58225b5..9d79914ac3432642521c99dd5614841c52d1945f 100644 (file)
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -45,17 +45,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 52ecbffe7f1c8d00ec69f09698e535bd3d19d3b2..6a839e64cf49ef0d5b08c1b5dbe5c0f1661d1ef1 100644 (file)
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -60,12 +60,7 @@ else
                $(ICECREAM_RUN) $(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))
        $(call gb_Trace_EndRange,$*,PYT)
 endif
 

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 92eaaf9faefb912c27d2f4b22529589ce9f77119..1ab28ca27e2f8dc0d3367b321d08d2c04134edba 100644 (file)
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -82,16 +82,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