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 /sw/CppunitTest_sw_ooxmlimport.mk | |
parent | sc: ScFiltersTest::testOptimalHeightReset() check DeleteContents success (diff) | |
download | core-f0a60415597bae7ca54767b397a217882578ce97.tar.gz core-f0a60415597bae7ca54767b397a217882578ce97.zip |
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_ooxmlimport.mk')
-rw-r--r-- | sw/CppunitTest_sw_ooxmlimport.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 5d21e9eefcc4..6ee96e31b3d0 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -89,6 +89,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlimport)) - # vim: set noet sw=4 ts=4: |