summaryrefslogtreecommitdiffstats
path: root/solenv/gbuild/JunitTest.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-08-03 23:24:23 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-03 23:27:13 +0200
commit8d35d24f7991e77814838bb6edbfae051a063a6c (patch)
treebfa339be070cd7ed094acfa7dbcb6987e3f10d94 /solenv/gbuild/JunitTest.mk
parentsal: let DISABLE_SAL_DBGBOX only disable GUI message boxes (diff)
downloadcore-8d35d24f7991e77814838bb6edbfae051a063a6c.tar.gz
core-8d35d24f7991e77814838bb6edbfae051a063a6c.zip
gbuild: run JunitTests and CppunitTests with DISABLE_SAL_DBGBOX
DBGSV_ERROR_OUT=shell already disables GUI message boxes on assertions, but it does not take effect during early startup and late shutdown, when the tools redirection hooks are not installed; setting DISABLE_SAL_DBGBOX disables these on Windows in osl_assertFailedLine. Change-Id: Ibb62054741e85dc966a36cb20515c3af8e0d9c11
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
-rw-r--r--solenv/gbuild/JunitTest.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index cd2e4ac5a110..b49337e22368 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -46,7 +46,8 @@ $(call gb_JunitTest_get_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
- (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \
+ (DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \
+ $(gb_JunitTest_JAVACOMMAND) \
-cp "$(T_CP)" \
$(DEFS) \
org.junit.runner.JUnitCore \