| author | Michael Stahl <mstahl@redhat.com> | 2012-08-03 21:24:23 (GMT) |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-03 21:27:13 (GMT) |
| commit | 8d35d24f7991e77814838bb6edbfae051a063a6c (patch) (side-by-side diff) | |
| tree | bfa339be070cd7ed094acfa7dbcb6987e3f10d94 | |
| parent | dae7245c1ab1e7f09634d32b139cf9997b37fb99 (diff) | |
| download | core-8d35d24f7991e77814838bb6edbfae051a063a6c.zip core-8d35d24f7991e77814838bb6edbfae051a063a6c.tar.gz | |
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
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index ab33bd9..a3e91de 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -87,6 +87,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET) $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(if $(DBGSV_ERROR_OUT),DBGSV_ERROR_OUT=$(DBGSV_ERROR_OUT)) \ + DISABLE_SAL_DBGBOX=t \ $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \ STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \ diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index cd2e4ac..b49337e 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 \ |