From f0a60415597bae7ca54767b397a217882578ce97 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 27 Feb 2015 19:05:54 +0100 Subject: 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 --- sw/CppunitTest_sw_globalfilter.mk | 2 -- sw/CppunitTest_sw_htmlexport.mk | 2 -- sw/CppunitTest_sw_htmlimport.mk | 2 -- sw/CppunitTest_sw_layout_test.mk | 2 -- sw/CppunitTest_sw_macros_test.mk | 2 -- sw/CppunitTest_sw_odfexport.mk | 2 -- sw/CppunitTest_sw_odfimport.mk | 2 -- sw/CppunitTest_sw_ooxmlfieldexport.mk | 2 -- sw/CppunitTest_sw_ooxmlimport.mk | 2 -- sw/CppunitTest_sw_ooxmlsdrexport.mk | 2 -- sw/CppunitTest_sw_ooxmlw14export.mk | 2 -- sw/CppunitTest_sw_rtfexport.mk | 2 -- sw/CppunitTest_sw_rtfimport.mk | 2 -- sw/CppunitTest_sw_uiwriter.mk | 2 -- sw/CppunitTest_sw_ww8export.mk | 2 -- sw/CppunitTest_sw_ww8import.mk | 2 -- sw/ooxmlexport_setup.mk | 2 -- 17 files changed, 34 deletions(-) (limited to 'sw') diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk index fd2001efadae..c6fa6ccd1168 100644 --- a/sw/CppunitTest_sw_globalfilter.mk +++ b/sw/CppunitTest_sw_globalfilter.mk @@ -91,6 +91,4 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sw_globalfilter,\ $(eval $(call gb_CppunitTest_use_configuration,sw_globalfilter)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_globalfilter)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 23cdef152076..6d8b9fd01e0d 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -89,6 +89,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlexport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk index dd7d6e7f6b73..410c6baa9d26 100644 --- a/sw/CppunitTest_sw_htmlimport.mk +++ b/sw/CppunitTest_sw_htmlimport.mk @@ -54,6 +54,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_htmlimport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_htmlimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlimport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index dd8af0c6fec4..91327db91e91 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -94,6 +94,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_layout_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_layout_test)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 251597d0dd32..8792bc163c4b 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -107,6 +107,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index 97398af0a756..7bc7ed826a14 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -86,6 +86,4 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport)) - # vim: set noet sw=4 ts=4: 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: diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk index 31a77f979224..ae67c2087438 100644 --- a/sw/CppunitTest_sw_ooxmlfieldexport.mk +++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk @@ -48,8 +48,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlfieldexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlfieldexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlfieldexport)) - $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlfieldexport,\ oox_generated \ )) 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: diff --git a/sw/CppunitTest_sw_ooxmlsdrexport.mk b/sw/CppunitTest_sw_ooxmlsdrexport.mk index a5e25fcaad44..65e6ec3c87fd 100644 --- a/sw/CppunitTest_sw_ooxmlsdrexport.mk +++ b/sw/CppunitTest_sw_ooxmlsdrexport.mk @@ -48,8 +48,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlsdrexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlsdrexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlsdrexport)) - $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlsdrexport,\ oox_customshapes \ oox_generated \ diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk index 10583ec53c86..5958019b8820 100644 --- a/sw/CppunitTest_sw_ooxmlw14export.mk +++ b/sw/CppunitTest_sw_ooxmlw14export.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlw14export,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlw14export)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlw14export)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index 48c87589d5ac..b47c9068a705 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfexport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index 049e1a13cc37..3eafcea38e58 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -81,6 +81,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfimport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index a34093b39d89..45112a47d5e8 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -59,6 +59,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_uiwriter)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 6a661028cad5..d7ea01189ef8 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -81,6 +81,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8export)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index b916cefeff20..63230e47021e 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -73,6 +73,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8import)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8import)) - # vim: set noet sw=4 ts=4: diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 03f6bacac7cc..5eeccadd0c0a 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -101,8 +101,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport$(1),\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport$(1))) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport$(1))) - $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlexport$(1),\ oox_customshapes \ oox_generated \ -- cgit v1.2.3