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 /dbaccess | |
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 'dbaccess')
5 files changed, 5 insertions, 0 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index 66abc7c58ac0..d5ff6bd3203c 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\ )) $(eval $(call gb_CppunitTest_use_ure,dbaccess_dialog_save)) +$(eval $(call gb_CppunitTest_use_vcl,dbaccess_dialog_save)) $(eval $(call gb_CppunitTest_use_components,dbaccess_dialog_save,\ basic/util/sb \ diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index 631c72e17f4f..2fe7e9476132 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_embeddeddb_performancetest,\ )) $(eval $(call gb_CppunitTest_use_ure,dbaccess_embeddeddb_performancetest)) +$(eval $(call gb_CppunitTest_use_vcl,dbaccess_embeddeddb_performancetest)) $(eval $(call gb_CppunitTest_use_components,dbaccess_embeddeddb_performancetest,\ basic/util/sb \ diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index 1cb545d955ca..68351a7c54f3 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\ )) $(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_test)) +$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_test)) $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\ basic/util/sb \ diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index 5bdaef6101a3..75b7a3e0599a 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\ )) $(eval $(call gb_CppunitTest_use_ure,dbaccess_hsqldb_test)) +$(eval $(call gb_CppunitTest_use_vcl,dbaccess_hsqldb_test)) $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\ basic/util/sb \ diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index df8d67bf79dc..e0b81c8a06ab 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ )) $(eval $(call gb_CppunitTest_use_ure,dbaccess_macros_test)) +$(eval $(call gb_CppunitTest_use_vcl,dbaccess_macros_test)) $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ basic/util/sb \ |