From 369d95931f42267eb2f55e066f58ee859183025d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 4 Jun 2014 08:45:54 +0200 Subject: DeInitVCL at end of tests This required some changes to the framework: * Init-/DeInitVCL is no longer done per individual test in BootstrapFixture, but once per CppunitTest invocation in a new vclbootstrapprotector (similarly to the exisiting unobootstrapprotector). CppunitTests that need VCL now need to declare gb_CppunitTest_use_vcl. * For things to work properly, the UNO component context needs to be disposed from within DeInitVCL (cf. Desktop's Application::DeInit called from DeInitVCL). The easiest solution was to introduce an Application::setDeInitHook (where the hook is called from DeInitVCL) specifically for vclbootstrapprotector to call. * PythonTests don't (yet) call DeInitVCL; they still hook into BootstrapFixture's original test_init functionality (to call InitVCL), and do not make use of the vclbootstrapprotector. Change-Id: I4f3a3c75db30b58c1cd49d81c51db14902ed68b2 --- postprocess/CppunitTest_services.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'postprocess/CppunitTest_services.mk') diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk index 5a8a65dbe298..bdcae7bbe0c6 100644 --- a/postprocess/CppunitTest_services.mk +++ b/postprocess/CppunitTest_services.mk @@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,services, \ $(eval $(call gb_CppunitTest_use_sdk_api,services)) $(eval $(call gb_CppunitTest_use_ure,services)) +$(eval $(call gb_CppunitTest_use_vcl,services)) $(eval $(call gb_CppunitTest_use_rdb,services,services)) ifneq ($(DISABLE_PYTHON),TRUE) -- cgit