diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml index f558364dcf7ed2a156865b3738e88ea8073788fd..f9ff3840c74b2cc06caea2b2fa19f827f7efcb80 100644 --- a/releng.wtpbuilder/distribution/dali.tests/build.xml +++ b/releng.wtpbuilder/distribution/dali.tests/build.xml @@ -83,6 +83,16 @@ name="base.install.dir" value="${testRoot}" /> </ant> + <ant + antfile="${test.component.dir}/extradependencies.xml" + target="get"> + <property + name="dependency.properties" + value="${buildDirectory}/maps/${env.RELENGDALI}/maps/dali.dependencies.properties" /> + <property + name="base.install.dir" + value="${testRoot}" /> + </ant> <antcall target="unzipTests" /> <antcall diff --git a/releng.wtpbuilder/distribution/dali.tests/extradependencies.xml b/releng.wtpbuilder/distribution/dali.tests/extradependencies.xml new file mode 100644 index 0000000000000000000000000000000000000000..1c8431f5d1591c99c005b159814e17e9965f1f4e --- /dev/null +++ b/releng.wtpbuilder/distribution/dali.tests/extradependencies.xml @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<!-- ====================================================================== + Properties that must be passed to this script: + base.install.dir + dependencyTargets + local.cache.dir + dependency.properties + + ====================================================================== --> +<project + name="test" + default="get"> + + <target name="get"> + + <antcall target="getAndInstall"> + <param + name="groupId" + value="jst" /> + </antcall> + + </target> + + <target name="getAndInstall"> + + <ant + antfile="${dependencyTargets}" + target="checkDependency"> + <property + name="groupId" + value="${groupId}" /> + </ant> + <ant + antfile="${dependencyTargets}" + target="installDependency"> + <property + name="groupId" + value="${groupId}" /> + <property + name="install.destination" + value="${base.install.dir}" /> + </ant> + </target> + +</project> diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml index 36f563bb45aa7b4d314d3bbe34313d047e27e4e6..43fff324db8898b99f17a6e0d3f832b0df10fe4a 100644 --- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml +++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml @@ -51,11 +51,7 @@ name="groupId" value="eclipseTestFramework" /> </antcall> - <antcall target="getAndInstallDropins"> - <param - name="groupId" - value="wtp" /> - </antcall> + <antcall target="getAndInstallBase"> <param