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 --- writerperfect/CppunitTest_writerperfect_calc.mk | 1 + writerperfect/CppunitTest_writerperfect_draw.mk | 1 + writerperfect/CppunitTest_writerperfect_impress.mk | 1 + writerperfect/CppunitTest_writerperfect_stream.mk | 1 + 4 files changed, 4 insertions(+) (limited to 'writerperfect') diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk b/writerperfect/CppunitTest_writerperfect_calc.mk index 1a05595056b6..462871f072bd 100644 --- a/writerperfect/CppunitTest_writerperfect_calc.mk +++ b/writerperfect/CppunitTest_writerperfect_calc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_calc,\ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_calc)) +$(eval $(call gb_CppunitTest_use_vcl,writerperfect_calc)) $(eval $(call gb_CppunitTest_use_rdb,writerperfect_calc,services)) diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk index de022846ff2e..fac4476a1457 100644 --- a/writerperfect/CppunitTest_writerperfect_draw.mk +++ b/writerperfect/CppunitTest_writerperfect_draw.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_draw,\ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_draw)) +$(eval $(call gb_CppunitTest_use_vcl,writerperfect_draw)) $(eval $(call gb_CppunitTest_use_rdb,writerperfect_draw,services)) diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk index bc361f7d768a..4da810cb8f0d 100644 --- a/writerperfect/CppunitTest_writerperfect_impress.mk +++ b/writerperfect/CppunitTest_writerperfect_impress.mk @@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_impress,\ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_impress)) +$(eval $(call gb_CppunitTest_use_vcl,writerperfect_impress)) $(eval $(call gb_CppunitTest_use_rdb,writerperfect_impress,services)) diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk index ad943e092692..337d6f1b480d 100644 --- a/writerperfect/CppunitTest_writerperfect_stream.mk +++ b/writerperfect/CppunitTest_writerperfect_stream.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_api,writerperfect_stream,\ )) $(eval $(call gb_CppunitTest_use_ure,writerperfect_stream)) +$(eval $(call gb_CppunitTest_use_vcl,writerperfect_stream)) $(eval $(call gb_CppunitTest_use_externals,writerperfect_stream,\ boost_headers \ -- cgit