diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml index 8b55f68bcfe5403351200b563f6af9c3e929190b..5843fc03b35beeabf93459928a59debc73893c69 100644 --- a/releng.wtpbuilder/components/dali.tests/dependency.xml +++ b/releng.wtpbuilder/components/dali.tests/dependency.xml @@ -13,6 +13,7 @@ default="get"> <target name="get"> + <antcall target="getAndInstall"> <param name="groupId" value="orbitthirdparty" /> </antcall> @@ -41,13 +42,12 @@ name="groupId" value="eclipseTestFramework" /> </antcall> - - <antcall target="getAndInstallWSTTests" /> - + </target> <target name="getAndInstall" unless="skipGetAndInstall"> + <ant antfile="${dependencyTargets}" target="checkDependency"> @@ -65,29 +65,7 @@ name="install.destination" value="${base.install.dir}" /> </ant> - </target> - - <target name="getAndInstallWSTTests"> - <mkdir dir="${baseLocation}/plugins/_temp_"/> - <copy todir="${baseLocation}/plugins/_temp_"> - <fileset dir="${baseLocation}/plugins"> - <include name="org.eclipse.wst.common.tests.collector*/**"/> - </fileset> - <mapper type="merge" to="wst.common.tests.collector"/> - </copy> - <available property="skipGetAndInstall" - value="true" - file="${baseLocation}/plugins/_temp_/wst.common.tests.collector" - type="file" /> - <delete dir="${baseLocation}/plugins/_temp_" failonerror="false" /> - - <antcall target="getAndInstall"> - <param - name="groupId" - value="wstAutomatedTests" /> - </antcall> - </target> - + </project> diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml index 2bacbea2f833845ca11b028bc39961c534e63e6b..978d800fab3681215b325ab0039c8dac6c66bb4a 100644 --- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml +++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml @@ -26,9 +26,6 @@ <antcall target="getAndInstall"> <param name="groupId" value="wtp" /> </antcall> - <antcall target="getAndInstall"> - <param name="groupId" value="wstAutomatedTests" /> - </antcall> <antcall target="getAndInstall"> <param name="groupId" value="eclipse" /> </antcall>