summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-02-27 19:05:54 +0100
committerMichael Stahl <mstahl@redhat.com>2015-02-27 19:33:07 +0100
commitf0a60415597bae7ca54767b397a217882578ce97 (patch)
tree353c68981f745ba4be44042b64934b063f220bf2 /cppcanvas
parent5f444791fbae38ad69a0497a074e2411da8cbb0f (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 'cppcanvas')
-rw-r--r--cppcanvas/CppunitTest_cppcanvas_emfplus.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index b47960913ca9..d4cc7c1add5d 100644
--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -62,8 +62,6 @@ $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
$(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus))
-$(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus))
-
$(call gb_CppunitTest_get_target,cppcanvas_emfplus): \
$(call gb_AllLangResTarget_get_target,ofa) \
$(call gb_AllLangResTarget_get_target,sd)