summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-25 05:24:23 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-25 05:24:23 +0100
commit279473f1ed6cd3bb6f6d2b8b9c75529b91836e39 (patch)
treefec7a149b5709fab947ccd849ea3faf9ba3edf2a /solenv
parent74f44646ba5b400cc39d78940677f136711459b5 (diff)
cut out noise in junit stacktrace for output, but keep them in log
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/JunitTest.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 10df1da38a50..dab548a1e6d4 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -54,7 +54,12 @@ $(call gb_JunitTest_get_target,%) :
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
$(DEFS) \
org.junit.runner.JUnitCore \
- $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) && \
+ $(CLASSES) 2>&1 > $@.log || \
+ (grep -v -e 'at org.junit.' \
+ -e 'at com.sun.star.lib.uno.' \
+ -e 'at java.lang.reflect.' \
+ -e 'at sun.reflect.' $@.log \
+ && echo "see full error log at $@.log" && false)) && \
rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)