diff --git a/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties b/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties index 795e3ec0a8491c527f941e29e599910879101e8e..75beda86c7521e755f7fefec4d693d4da6a79826 100644 --- a/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties +++ b/releng.wtpbuilder/components/wtp-patches32x/tobeInstalled.properties @@ -11,4 +11,3 @@ getprereq.dtp=false getprereq.wtp=false #getprereq.dltk=false -getprereq.testlibraries=true \ No newline at end of file diff --git a/releng.wtpbuilder/distribution/patches32x.tests/build.xml b/releng.wtpbuilder/distribution/patches32x.tests/build.xml index d3cef4c2558125311a37410cb8be128beddb1741..17be308191219191f0a1baa3282fd974d9e44e0a 100644 --- a/releng.wtpbuilder/distribution/patches32x.tests/build.xml +++ b/releng.wtpbuilder/distribution/patches32x.tests/build.xml @@ -92,19 +92,29 @@ unless="dependency.properties.exists"/> <property name="test.dependency" - value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/> + value="${wtp.builder.home}/scripts/dependency/dependency.xml"/> <available file="${test.dependency}" property="test.dependency.exists"/> <fail message="test dependency file not found: ${test.dependency}" unless="test.dependency.exists"/> + <echo message="test.dependency file: ${test.dependency}" /> <ant antfile="${test.dependency}" target="get"> <property name="base.install.dir" value="${testRoot}"/> + <property + name="tobeinstalled.properties" + value="${wtp.builder.home}/distribution/${build.distribution}.tests/tobeInstalled.properties"/> + <property + name="installWorkingDirectory" + value="${testRoot}"/> + + + </ant> <antcall target="unzipTests"/> diff --git a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml index 51013ce3d39a8eab071124b090a7b958e382877a..5b0d54e40f38e52b858a367e3c4c95697a9b93f8 100644 --- a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml +++ b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/test.xml @@ -121,8 +121,12 @@ <subant target="" inheritall="true"> + <!-- note that we specify "high" directory to get tests installed + in any location --> <fileset dir="${testRoot}"> + <!-- but we must be sure to exclude _this_ test.xml file + we are running --> <exclude name="test.xml"/> <exclude diff --git a/releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties b/releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties new file mode 100644 index 0000000000000000000000000000000000000000..babb454ee37d570b77e1e54de7ea0f4b0a26fc91 --- /dev/null +++ b/releng.wtpbuilder/distribution/patches32x.tests/tobeInstalled.properties @@ -0,0 +1,14 @@ +getprereq.eclipse=true +getprereq.eclipsetestframework=true +#getprereq.eclipseplatform=false +getprereq.emf=false +getprereq.emfxsd=false +#getprereq.emfvalidation=false +getprereq.gef=false +getprereq.dtp=false +#getprereq.wst=false +#getprereq.jst=false +getprereq.wtp=false +#getprereq.dltk=false + +getprereq.testlibraries=true