From f09f6f759342ec2e2472601f32de492088a46d10 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 27 Nov 2023 19:15:44 +0100
Subject: [PATCH] do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff
---
 odk/build-examples_common.mk |  7 +------
 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(+), 39 deletions(-)

diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 08b8d5e3c23..80c7cbaa284 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -49,12 +49,7 @@ else
 		&& printf 'yes\n' | LC_ALL=C make -j1 \
 			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 18af97e7fff..a15c074cede 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -158,12 +158,7 @@ else
 		$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
 		$(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 66f90a34f4c..d8b1ebc32d4 100644
--- 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 641ff838e4d..c573bfbf7ad 100644
--- 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 2d5867b32d2..2ee93160b2a 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -85,16 +85,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
 
-- 
2.30.2