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 /connectivity | |
| parent | 9e13afeaf67b9c07762692cd858de4b577234ab7 (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 'connectivity')
| -rw-r--r-- | connectivity/CppunitTest_connectivity_commontools.mk | 1 | ||||
| -rw-r--r-- | connectivity/CppunitTest_connectivity_mork.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index dc726dcd4b42..e1c899ee1780 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\ )) $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools)) +$(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools)) $(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers)) diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk index f4e31d52dc49..f07601493871 100644 --- a/connectivity/CppunitTest_connectivity_mork.mk +++ b/connectivity/CppunitTest_connectivity_mork.mk @@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_api,connectivity_mork,\ )) $(eval $(call gb_CppunitTest_use_ure,connectivity_mork)) +$(eval $(call gb_CppunitTest_use_vcl,connectivity_mork)) $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork)) |