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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/CppunitTest_filter_pcx_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_pict_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_ppm_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_psd_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_ras_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_tga_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_tiff_test.mk | 1 | ||||
| -rw-r--r-- | filter/CppunitTest_filter_xslt.mk | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk index 5a5f6d6e08be..6f054ca6793f 100644 --- a/filter/CppunitTest_filter_pcx_test.mk +++ b/filter/CppunitTest_filter_pcx_test.mk @@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_pcx_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_pcx_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_pcx_test)) $(eval $(call gb_CppunitTest_use_components,filter_pcx_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index a3fabd1615a9..174274570a65 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_pict_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_pict_test)) $(eval $(call gb_CppunitTest_use_components,filter_pict_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk index cce904126206..147d8e9a9000 100644 --- a/filter/CppunitTest_filter_ppm_test.mk +++ b/filter/CppunitTest_filter_ppm_test.mk @@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_ppm_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_ppm_test)) $(eval $(call gb_CppunitTest_use_components,filter_ppm_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk index 850cc32dcac3..9df6c4e27dd8 100644 --- a/filter/CppunitTest_filter_psd_test.mk +++ b/filter/CppunitTest_filter_psd_test.mk @@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_psd_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_psd_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_psd_test)) $(eval $(call gb_CppunitTest_use_components,filter_psd_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk index feead9d3b597..22a49508c0fa 100644 --- a/filter/CppunitTest_filter_ras_test.mk +++ b/filter/CppunitTest_filter_ras_test.mk @@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_ras_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_ras_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_ras_test)) $(eval $(call gb_CppunitTest_use_components,filter_ras_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 3707f7998f0e..f788611352ad 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_tga_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_tga_test)) $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 3d653da77186..42122c8f79d7 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_tiff_test)) +$(eval $(call gb_CppunitTest_use_vcl,filter_tiff_test)) $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\ configmgr/source/configmgr \ diff --git a/filter/CppunitTest_filter_xslt.mk b/filter/CppunitTest_filter_xslt.mk index 181f4824b59f..feaf5028530f 100644 --- a/filter/CppunitTest_filter_xslt.mk +++ b/filter/CppunitTest_filter_xslt.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_xslt,\ )) $(eval $(call gb_CppunitTest_use_ure,filter_xslt)) +$(eval $(call gb_CppunitTest_use_vcl,filter_xslt)) $(eval $(call gb_CppunitTest_use_configuration,filter_xslt)) |