diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:05:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:33:07 +0100 |
| commit | f0a60415597bae7ca54767b397a217882578ce97 (patch) | |
| tree | 353c68981f745ba4be44042b64934b063f220bf2 /sd | |
| parent | 5f444791fbae38ad69a0497a074e2411da8cbb0f (diff) | |
gbuild: CppunitTest: always use unittest configuration
The sc_subsequent_filters_test was failing because of a lock file
because it did not use the unittest configuration.
Refactor gb_CppunitTest_use_configuration so it uses both the instdir
and unittest configuration to prevent such errors.
In case there ever is a test that does not work with the unittest
configuration it should call gb_CppunitTest_use_instdir_configuration.
Change-Id: Ibc00d42f8b6102d50d922f51173120798fa45c6e
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_export_tests.mk | 2 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_html_export_tests.mk | 2 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_import_tests.mk | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk index 1c54b95f0c99..e1fdbc4e03ce 100644 --- a/sd/CppunitTest_sd_export_tests.mk +++ b/sd/CppunitTest_sd_export_tests.mk @@ -73,8 +73,6 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sd_export_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_export_tests)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_export_tests)) - $(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index 0feb03b63cc2..02908d8c7ac7 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -111,8 +111,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_html_export_tests)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_html_export_tests)) - $(call gb_CppunitTest_get_target,sd_html_export_tests) : $(call gb_AllLangResTarget_get_target,sd) # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index e0658500dbbc..8a84e4c556cf 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -108,8 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_import_tests)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_import_tests)) - $(eval $(call gb_CppunitTest_add_arguments,sd_import_tests,\ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) |