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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/CppunitTest_chart2_export.mk | 2 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_import.mk | 2 | ||||
| -rw-r--r-- | chart2/CppunitTest_chart2_xshape.mk | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk index a1a4bd6bac8c..51ce6b651300 100644 --- a/chart2/CppunitTest_chart2_export.mk +++ b/chart2/CppunitTest_chart2_export.mk @@ -132,6 +132,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_export)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_export)) - # vim: set noet sw=4 ts=4: diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index 50d58f2f10e5..e101993e9eb4 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -130,8 +130,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_import)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_import)) - $(call gb_CppunitTest_get_target,chart2_import): \ $(call gb_AllLangResTarget_get_target,sd) diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index 99149a6e0cb2..bb50d5b59608 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -127,6 +127,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_xshape)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_xshape)) - # vim: set noet sw=4 ts=4: |