diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-17 11:47:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-17 12:52:26 +0200 |
| commit | b254f4fb0a2d53da8f4c6a16ec7e393ee91620c4 (patch) | |
| tree | 8db74fefb0c0f168996b53b5d1dc4f6e80293951 /solenv | |
| parent | 3e88d02082219c318555c0eaaa739de3d4ea8a5d (diff) | |
gbuild: add gb_Junit_use_external and clean up connectivity complex test
Change-Id: I8c4b6ff6b1993d1c4de68696089f86fbcf4cecc6
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index ea98eaf70491..9e57be290047 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -229,7 +229,7 @@ $$(call gb_Output_error,\ endef define gb_Jar_use_system_jars -$(call gb_JavaClassSet_use_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$(foreach jar,$(2),$(call gb_Jar_use_system_jar,$(1),$(jar))) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 590f8480581b..8a5ff4564321 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -137,6 +137,30 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call endef +define gb_JunitTest_use_system_jar +$(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + +define gb_JunitTest_use_system_jars +$(foreach jar,$(2),$(call gb_JunitTest_use_system_jar,$(1),$(jar))) + +endef + +# this forwards to functions that must be defined in RepositoryExternal.mk. +# $(eval $(call gb_JunitTest_use_external,jar,external)) +define gb_JunitTest_use_external +$(if $(value gb_JunitTest__use_$(2)),\ + $(call gb_JunitTest__use_$(2),$(1)),\ + $(error gb_JunitTest_use_external: unknown external: $(2))) + +endef + +define gb_JunitTest_use_externals +$(foreach external,$(2),$(call gb_JunitTest_use_external,$(1),$(external))) + +endef + define gb_JunitTest_add_customtarget_dependency $$(call gb_Output_error,\ gb_JunitTest_add_customtarget_dependency: use gb_Jar_use_customtarget instead.) @@ -177,6 +201,10 @@ gb_JunitTest_add_sourcefiles := gb_JunitTest_use_jar := gb_JunitTest_use_jars := gb_JunitTest_use_jar_classset := +gb_JunitTest_use_system_jar := +gb_JunitTest_use_system_jars := +gb_JunitTest_use_external := +gb_JunitTest_use_externals := gb_JunitTest_use_customtarget := gb_JunitTest_use_customtargets := |