diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-24 13:20:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-24 13:28:07 +0200 |
| commit | 04bc75a9b1d5e14c5ec863fd6d0c70d02d5d9da5 (patch) | |
| tree | 941c5b8b1de7b00abdae1f273f7d59081608add8 /configmgr | |
| parent | 86bef9224e0f10bfc81bc87c0302d9cee0d33dd6 (diff) | |
Beware gb_CppunitTest_use_library_files plus gb_CppunitTest_use_component
...it causes the library's objects to be loaded twice, causing potential trouble
with static data. So introduce gb_Cppunit_set_componentfile, processing the
library's source component file into an additional workdir/CppuntiTest/
component file referencing the test library. (This required to drop the
gb_Helper_abbreviate_dirs bric-a-brac, as it would do $W replacement into file
URLs contained in the resulting .component file.)
Change-Id: I57847e549817d25cca53a13effd7d408e0c99f9a
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/CppunitTest_configmgr_unit.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk index 18e40f204860..1672c9f42556 100644 --- a/configmgr/CppunitTest_configmgr_unit.mk +++ b/configmgr/CppunitTest_configmgr_unit.mk @@ -15,6 +15,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,configmgr_unit, \ configmgr/qa/unit/test \ )) +$(eval $(call gb_CppunitTest_set_componentfile,configmgr_unit,configmgr/source/configmgr)) + $(eval $(call gb_CppunitTest_use_library_objects,configmgr_unit,configmgr)) $(eval $(call gb_CppunitTest_use_sdk_api,configmgr_unit,)) @@ -37,7 +39,6 @@ $(eval $(call gb_CppunitTest_use_ure,configmgr_unit)) $(eval $(call gb_CppunitTest_use_configuration,configmgr_unit)) $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\ - configmgr/source/configmgr \ i18npool/util/i18npool \ i18npool/source/search/i18nsearch \ sax/source/expatwrap/expwrap \ |