summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-13 11:13:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-13 13:15:25 +0100
commit8d7e8a0a3b9a4a4f7b805e91674b79a4cca7cf72 (patch)
treebb736d3ccaeb1732b552ae1f537c5f3ef0c41c0b /solenv/gbuild
parent452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (diff)
setup/teardown default component context once before/after all tests
avoids the problems of dangling uno singletons invalidated after the first dispose and the chain of other singletons that don't expect to need to re-initialize, etc. reenable editeng cppunit test inherit i18npool cppunit test from unotest base drop LibreOfficeProtector, do "throwable" work in setUp/tearDown not in ctors/dtors
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/CppunitTest.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 6f6b32522d4a..258fc52da6c4 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -68,8 +68,9 @@ $(if $(URE),\
"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \
$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
-env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
- --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \
-$(ARGS)
+ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+ --protector unobootstrapprotector$(gb_Library_DLLEXT) unobootstrapprotector \
+ ) $(ARGS)
endef
.PHONY : $(call gb_CppunitTest_get_clean_target,%)