diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-04 08:45:54 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-04 08:55:12 +0200 |
commit | 369d95931f42267eb2f55e066f58ee859183025d (patch) | |
tree | f6047cebccb31dea56653bb1adfa08f853d09918 /sdext | |
parent | Cover ctors/dtors of our TestFixtures under the protectors, too (diff) | |
download | core-369d95931f42267eb2f55e066f58ee859183025d.tar.gz core-369d95931f42267eb2f55e066f58ee859183025d.zip |
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 'sdext')
-rw-r--r-- | sdext/CppunitTest_sdext_pdfimport.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sdext/CppunitTest_sdext_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk index a7e2a869260b..56680f2e56c2 100644 --- a/sdext/CppunitTest_sdext_pdfimport.mk +++ b/sdext/CppunitTest_sdext_pdfimport.mk @@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\ $(eval $(call gb_CppunitTest_use_executable,sdext_pdfimport,xpdfimport)) $(eval $(call gb_CppunitTest_use_ure,sdext_pdfimport)) +$(eval $(call gb_CppunitTest_use_vcl,sdext_pdfimport)) $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\ comphelper/util/comphelp \ |