224522 fix to make dropins folder variable based on stream
diff --git a/releng.wtpbuilder/distribution/incubator.tests/build.xml b/releng.wtpbuilder/distribution/incubator.tests/build.xml
index d1e18da..173d2da 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/build.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/build.xml
@@ -110,7 +110,7 @@
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-incubator-xsl_sdk-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-incubator-xsl_sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
<echo
message="installing xsl tests" />
@@ -119,7 +119,7 @@
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}/eclipse/dropins" />
+ line="-o -qq wtp-incubator-xsl-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
</target>
@@ -147,7 +147,7 @@
value="${env.JAVA_5_HOME}/bin/java" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/dropins/eclipse/plugins" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins" />
<property
name="vmargs"
value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
index e4720d8..fa0ac66 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/test.xml
@@ -40,7 +40,7 @@
<!-- The root of the eclipse installation -->
<property
name="eclipse-home"
- value="${testRoot}/eclipse/dropins/eclipse/" />
+ value="${testRoot}${dropinsFolder}/eclipse/" />
<!-- The directory that will contain the xml and html results from the tests that are run -->
<property
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
index ca10224..d14161d 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testScripts/wtp-junit-tests.xml
@@ -50,7 +50,7 @@
value="${junit-report-output}" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/dropins/eclipse/plugins/${testPlugin}" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
diff --git a/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml b/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
index 06c829c..79fc162 100644
--- a/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/incubator.tests/testdependency.xml
@@ -89,7 +89,7 @@
value="${groupId}" />
<property
name="install.destination"
- value="${base.install.dir}/eclipse/dropins" />
+ value="${base.install.dir}${dropinsFolder}" />
</ant>
</target>