From eaf502821ee668abe277d8c9c65ac040d52cac8c Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 31 Aug 2018 11:45:39 +0100
Subject: [PATCH] do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff
---
 odk/build-examples_common.mk |  6 +-----
 solenv/gbuild/CppunitTest.mk |  7 +------
 solenv/gbuild/JunitTest.mk   | 12 +-----------
 solenv/gbuild/PythonTest.mk  |  7 +------
 solenv/gbuild/UITest.mk      | 11 +----------
 5 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 931d6eea856..5ea56e959bf 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -32,11 +32,7 @@ endif
 	    && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
 		&& printf 'yes\n' | LC_ALL=C make \
 		    $(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), )))) \
-	    >$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
-	|| (RET=$$$$? \
-	    $(if $(filter MACOSX,$(OS)), && rm -f $(ODK_BUILD_SHELL) , ) \
-	    && cat $(call gb_CustomTarget_get_workdir,$(1))/log \
-	    && exit $$$$RET)
+	    2>&1
 ifeq (MACOSX,$(OS))
 	-rm -f $(ODK_BUILD_SHELL)
 endif
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 45af5c9b25a..7933fc84c8b 100644
--- 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 36f29b50ef2..3ac4603ff6a 100644
--- 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 9b0590e35d2..3a1d7d9cace 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -58,12 +58,7 @@ else
 		$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \
 			$(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 03d30448ef7..5628e47866f 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -77,16 +77,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
-- 
2.30.2