mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: run JunitTests and CppunitTests with DISABLE_SAL_DBGBOX

Browse Source 
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
This commit is contained in:
Michael Stahl 2012-08-03 23:24:23 +02:00
parent dae7245c1a
commit 8d35d24f79
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/gbuild/CppunitTest.mk
View File

@ -87,6 +87,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(DBGSV_ERROR_OUT),DBGSV_ERROR_OUT=$(DBGSV_ERROR_OUT)) \ $(if $(DBGSV_ERROR_OUT),DBGSV_ERROR_OUT=$(DBGSV_ERROR_OUT)) \
DISABLE_SAL_DBGBOX=t \
$(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \ $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \ STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \

3
solenv/gbuild/JunitTest.mk
View File

@ -46,7 +46,8 @@ $(call gb_JunitTest_get_target,%) :
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
rm -rf $(call gb_JunitTest_get_userdir,$*) && \ rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(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)" \ -cp "$(T_CP)" \
$(DEFS) \ $(DEFS) \
org.junit.runner.JUnitCore \ org.junit.runner.JUnitCore \