diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-30 15:04:37 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-07 15:53:01 +0100 |
| commit | ddc71f6537d3b0ecd2c98a42ec48281e0309e576 (patch) | |
| tree | 24f99251ff0971e09f24b1a9101ddee7b12e984b /solenv/gbuild/JunitTest.mk | |
| parent | fff30fefb48e0a729f266c38f97ee4654c0b7ea1 (diff) | |
do not globally export G_SLICE, GLIBCXX_FORCE_NEW, DBGSV_ERROR_OUT
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index b6ce9039a403..8f7c6aeb08bd 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -31,9 +31,6 @@ 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,%)) @@ -42,13 +39,14 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe ifneq (,$(strip $(OOO_JUNIT_JAR))) +# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell .PHONY : $(call gb_JunitTest_get_target,%) $(call gb_JunitTest_get_target,%) : $(call gb_Output_announce,$*,$(true),JUT,2) $(call gb_Helper_abbreviate_dirs_native,\ rm -rf $(call gb_JunitTest_get_userdir,$*) && \ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ - ($(gb_JunitTest_JAVACOMMAND) \ + (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \ -cp "$(CLASSPATH)" \ $(DEFS) \ org.junit.runner.JUnitCore \ |