diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
commit | 5f08d6e5a4383db99a1ed314181b594a338200dc (patch) | |
tree | 12fda47cee050e541880785f349cb98438ce1972 /solenv/gbuild/JunitTest.mk | |
parent | Treat DragonFly as Linux. (diff) | |
parent | masterfix DEV300: #i10000# fix for LAN" (diff) | |
download | core-5f08d6e5a4383db99a1ed314181b594a338200dc.tar.gz core-5f08d6e5a4383db99a1ed314181b594a338200dc.zip |
Merge commit 'ooo/DEV300_m103'
Conflicts:
configure
configure.in
instsetoo_native/util/openoffice.lst
set_soenv.in
solenv/bin/cws.pl
solenv/bin/modules/installer/simplepackage.pm
solenv/gbuild/LinkTarget.mk
solenv/gbuild/extensions/post_PackModule.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/windows.mk
solenv/inc/installationtest.mk
solenv/inc/minor.mk
soltools/cpp/_eval.c
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
-rw-r--r-- | solenv/gbuild/JunitTest.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 7334cdf4d5d4..5be81ab6ca20 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -30,6 +30,10 @@ gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS) +# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell +DBGSV_ERROR_OUT := shell +export DBGSV_ERROR_OUT + .PHONY : $(call gb_JunitTest_get_clean_target,%) $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%)) $(call gb_Helper_abbreviate_dirs,\ |