path: root/cppcanvas/
diff options
authorStephan Bergmann <>2014-06-04 08:45:54 +0200
committerStephan Bergmann <>2014-06-04 08:55:12 +0200
commit369d95931f42267eb2f55e066f58ee859183025d (patch)
treef6047cebccb31dea56653bb1adfa08f853d09918 /cppcanvas/
parent9e13afeaf67b9c07762692cd858de4b577234ab7 (diff)
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
Diffstat (limited to 'cppcanvas/')
1 files changed, 1 insertions, 0 deletions
diff --git a/cppcanvas/ b/cppcanvas/
index d6a73b57d499..8cd15066e0af 100644
--- a/cppcanvas/
+++ b/cppcanvas/
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
+$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_emfplus))
$(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
canvas/source/cairo/cairocanvas \