diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-08 09:33:38 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-08 14:53:07 +0200 |
| commit | f2f09efd3cac622b3f4abf42695ccab0eed37247 (patch) | |
| tree | 1dc88844f01965c59c235a216db54e6f202e5c01 /solenv | |
| parent | 4a271bf4d2914473036c449550f165d7bf878f44 (diff) | |
fix generation of test arguments
udkapi.rdb, resp. xml/services.rdb were not added to UNO_TYPES, resp.
UNO_SERVICES env. var. in all cases.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 0709dc0ecd8f..25d40263d710 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -65,12 +65,10 @@ define gb_CppunitTest__make_args $(ARGS) \ --headless \ $(if $(strip $(UNO_TYPES)),\ - "-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\ + "-env:UNO_TYPES=$(foreach rdb,$(UNO_TYPES),\ $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \ $(if $(strip $(UNO_SERVICES)),\ - "-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \ - $(foreach item,$(UNO_SERVICES),\ - $(call gb_CppunitTarget__make_url,$(item)))") \ + "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_CppunitTarget__make_url,$(item)))") \ $(if $(URE),\ $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ -env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR)))) @@ -142,8 +140,8 @@ endef # TODO: Once we build the services.rdb with gbuild we should use its *_get_target method define gb_CppunitTest_uses_ure -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,udkapi) -$(call gb_CppunitTest_get_target,$(1)) : $(OUTDIR)/xml/ure/services.rdb +$(call gb_CppunitTest_use_type_rdb,$(1),udkapi) +$(call gb_CppunitTest_use_service_rdb,$(1),ure/services) $(call gb_CppunitTest_get_target,$(1)) : URE := $(true) endef @@ -175,9 +173,8 @@ $$(call gb_Output_error,\ endef define gb_CppunitTest_use_service_rdb -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2)) -$(call gb_CppunitTest_get_target,$(1)) : \ - UNO_SERVICES += $(call gb_RdbTarget_get_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Rdb_get_outdir_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(call gb_Rdb_get_outdir_target,$(2)) endef |