summaryrefslogtreecommitdiff
path: root/sw/CppunitTest_sw_odfimport.mk
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 /sw/CppunitTest_sw_odfimport.mk
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 'sw/CppunitTest_sw_odfimport.mk')
-rw-r--r--sw/CppunitTest_sw_odfimport.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 71223022d55a..eaa3542993d4 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -90,6 +90,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_odfimport))
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfimport))
-
# vim: set noet sw=4 ts=4: