[Libreoffice-commits] .: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/JunitTest.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit a3a0b819bbc597db7c536180c86986b91dd9b063
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 10 19:38:11 2012 +0200

    Avoid unhelpful 'Binary file ... matches' output instead of error information
    
    ...when grep happens to consider the log file to be binary (for whatever reason)
    as can be obvserved to happen on Linux-RHEL6-x86_64 at 14-with-check tinderbox.
    
    Change-Id: I5da0a792b45b83939c9c26897d30ddf8b0a0c0b0

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 31cf96e..5eb7d3a 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -51,10 +51,7 @@ $(call gb_JunitTest_get_target,%) :
             $(DEFS) \
             org.junit.runner.JUnitCore \
             $(CLASSES) > $@.log 2>&1 || \
-		(grep -v -e 'at org.junit.' \
-			-e 'at java.lang.reflect.' \
-			-e 'at sun.reflect.' $@.log \
-		&& echo "see full error log at $@.log" \
+		(cat $@.log \
 		&& echo "to rerun just this failed test without all others, run:" \
 		&& echo && echo "    make $@" && echo \
 		&& echo "cd into the module dir to run the tests faster" \