install tests, instead of dropins
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 3fa7e54..2055c04 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -133,34 +133,104 @@
<arg
line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
</exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg
- line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg
- line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
- executable="unzip"
- failonerror="false">
- <arg
- line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
- </exec>
- <exec
- dir="${buildDirectory}/${buildLabel}"
+
+
+ <exec
+ dir="${buildDirectory}/${buildLabel}/repos"
executable="unzip"
failonerror="true">
<arg
- line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
+ line="-o -qq wst.tests-buildrepo-${buildLabel}.zip -d ${testRoot}/wst.tests-buildrepo-${buildLabel}"/>
</exec>
+ <exec
+ dir="${buildDirectory}/${buildLabel}/repos"
+ executable="unzip"
+ failonerror="true">
+ <arg
+ line="-o -qq jst.tests-buildrepo-${buildLabel}.zip -d ${testRoot}/jst.tests-buildrepo-${buildLabel}"/>
+ </exec>
+
+ <exec
+ dir="${buildDirectory}/${buildLabel}/repos"
+ executable="unzip"
+ failonerror="true">
+ <arg
+ line="-o -qq dali.tests-buildrepo-${buildLabel}.zip -d ${testRoot}/dali.tests-buildrepo-${buildLabel}"/>
+ </exec>
+
+ <java
+ taskname="p2Director Install"
+ fork="true"
+ resultProperty="p2DirectorInstallResult"
+ failonerror="true"
+ timeout="${testTimeLimit}"
+ dir="${testRoot}"
+ jvm="${env.JAVA_6_HOME}/bin/java"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset
+ dir="${testRoot}/eclipse/plugins">
+ <include
+ name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
+
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+
+ <arg
+ value="-nosplash"/>
+ <arg
+ value="-consolelog"/>
+ <arg
+ value="-data"/>
+ <arg
+ value="${testRoot}/overallTestWorkspace"/>
+
+ <arg
+ value="-application"/>
+ <arg
+ value="org.eclipse.equinox.p2.director"/>
+
+ <arg
+ value="-destination"/>
+ <arg
+ value="${testRoot}/eclipse"/>
+
+ <arg
+ value="-profile"/>
+ <arg
+ value="SDKProfile"/>
+
+ <arg
+ value="-repository"/>
+ <arg
+ value="file://${testRoot}/wst.tests-buildrepo-${buildLabel},file://${testRoot}/jst.tests-buildrepo-${buildLabel},file://${testRoot}/dali.tests-buildrepo-${buildLabel}"/>
+
+ <arg
+ value="-installIU"/>
+ <arg
+ value="org.eclipse.jpt.tests.feature.feature.group,org.eclipse.jst.enterprise_tests.feature.feature.group,org.eclipse.jst.jsf.tests.feature.feature.group,org.eclipse.jst.server_adapters.ext_tests.feature.feature.group,org.eclipse.jst.server_tests.feature.feature.group,org.eclipse.jst.web_tests.feature.feature.group,org.eclipse.jst.ws.cxf_tests.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group,org.eclipse.jst.ws.jaxws_tests.feature.feature.group,org.eclipse.wst.common_tests.feature.feature.group,org.eclipse.wst.jsdt_tests.feature.feature.group,org.eclipse.wst.server_tests.feature.feature.group,org.eclipse.wst.web_tests.feature.feature.group,org.eclipse.wst.ws_tests.feature.feature.group,org.eclipse.wst.xml_tests.feature.feature.group,org.eclipse.wst.xsl_tests.feature.feature.group,org.eclipse.wtp.releng.tests.feature.feature.group"/>
+
+
+ <!-- make sure our forked env has a DISPLAY -->
+ <env
+ key="DISPLAY"
+ value="${env.DISPLAY}"/>
+ <redirector
+ output="${testRoot}/results/fullOutput.txt"
+ error="${testRoot}/results/fullErrorLog.txt"/>
+ <arg
+ value="-vmArgs" />
+ <arg
+ value="-Declipse.p2.data.area=${testRoot}/eclipse/p2"/>
+ </java>
+
+ <echo message="installation of tests result: ${p2DirectorInstallResult}" />
+<!--
+ <fail message="installation of tests failed" if="p2DirectorInstallResult"/>
+-->
+
</target>
<!--
time out may need to be set/adjust for api or performance tests?
@@ -314,10 +384,12 @@
value="-DtestDir=${testRoot}"/>
<jvmarg
value="-DeclipseBuilderDirectory=${pde.builder.path}"/>
- <!-- IBM_JAVA_OPTIONS contains JIT work arounds for bug 284441 -->
+ <!--
+ <!- - IBM_JAVA_OPTIONS contains JIT work arounds for bug 284441 - ->
<env
key="IBM_JAVA_OPTIONS"
value="-Xjit:{org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.primGetNextToken()Ljava/lang/String;}(disableLookahead),{org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.primGetNextToken()Ljava/lang/String;}(disableLookahead)"/>
+ -->
</java>
<echo
message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index db60a51..db60d3c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -98,7 +98,7 @@
target=""
inheritall="true">
<fileset
- dir="${testRoot}${dropinsFolder}/eclipse/plugins/">
+ dir="${testRoot}/eclipse/plugins/">
<exclude
name="**/*performance*/test.xml"/>
<!--