Bug 409190 - [restore test] restore some releng tests

Bug 411317 - Need to remove some "PDE Transition" code
Bug 387872 - BuildTests has no test that reports failures in
platform.doc.isv.schema.txt

3 files changed, 64 insertions, 16 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
index 327c3861b..b205c645b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
@@ -16,6 +16,36 @@
   </fileSets>
   <files>
     <file>
+      <source>${platform.doc.isv.javadoc}</source>
+      <outputDirectory>/eclipse-testing</outputDirectory>
+      <destName>platform.doc.isv.javadoc.txt</destName>
+    </file>
+    <file>
+      <source>${jdt.doc.isv.javadoc}</source>
+      <outputDirectory>/eclipse-testing</outputDirectory>
+      <destName>jdt.doc.isv.javadoc.txt</destName>
+    </file>
+    <file>
+      <source>${pde.doc.user.javadoc}</source>
+      <outputDirectory>/eclipse-testing</outputDirectory>
+      <destName>pde.doc.user.javadoc.txt</destName>
+    </file>
+    <file>
+      <source>${platform.doc.isv.schema}</source>
+      <outputDirectory>/eclipse-testing</outputDirectory>
+      <destName>platform.doc.isv.schema.txt</destName>
+    </file>
+    <file>
+      <source>${jdt.doc.isv.schema}</source>
+      <outputDirectory>/eclipse-testing</outputDirectory>
+      <destName>jdt.doc.isv.schema.txt</destName>
+    </file>
+    <file>
+      <source>${pde.doc.user.schema}</source>
+      <outputDirectory>/eclipse-testing</outputDirectory>
+      <destName>pde.doc.user.schema.txt</destName>
+    </file>
+    <file>
       <source>${project.build.directory}/eclipse-junit-tests.zip</source>
       <outputDirectory>/eclipse-testing</outputDirectory>
       <destName>eclipse-junit-tests-${buildId}.zip</destName>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index 5bb7ac00e..c3aae4812 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -1,5 +1,5 @@
 #Properties required by equinox p2 tests
-#Wed, 14 Mar 2012 19:41:56 -0400
+# Version from /eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/
 
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=\${basedir}/eclipse-platform-${buildId}-linux-gtk.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
@@ -7,12 +7,14 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\ecli
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-3.7.2-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-3.7.2-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-3.7.2-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-3.7.2-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=\${basedir}/eclipse-platform-3.7.2-macosx-cocoa.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-3.7.2-macosx-cocoa-x86_64.tar.gz
-org.eclipse.equinox.p2.tests.current.build.repo=file:/shared/eclipse/e4/lts/eclipse.platform.releng.aggregator/eclipse.platform.repository/target/repository/
-org.eclipse.equinox.p2.tests.last.release.build.repo=http://download.eclipse.org/eclipse/updates/3.7/R-3.7-201106131736
+
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.4-linux-gtk.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.4-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.4-win32.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.4-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=\${basedir}/eclipse-platform-4.4-macosx-cocoa.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.4-macosx-cocoa-x86_64.tar.gz
+
+org.eclipse.equinox.p2.tests.current.build.repo=http\://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.4/R-4.4-201406061215
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
index afa8db326..0df71b225 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
@@ -104,6 +104,13 @@
     </condition>
     <condition
       property="extraIU"
+      value="org.eclipse.releng.tools.feature.group">
+      <equals
+        arg1="${testPlugin}"
+        arg2="org.eclipse.releng.tests" />
+    </condition>
+    <condition
+      property="extraIU"
       value="org.eclipse.equinox.p2.discovery.feature.feature.group">
       <equals
         arg1="${testPlugin}"
@@ -340,18 +347,23 @@
     <property
       name="currentBuildRepo"
       value="${org.eclipse.equinox.p2.tests.current.build.repo}" />
-    <echo>-installIU ${extraIU} +</echo>
+    <echo>-installExtraIU ${extraIU} +</echo>
+    <echo>   from ${currentBuildRepo} </echo>
+    <echo>   into ${eclipse-home} </echo>
+    <echo>   using launcher: ${launcherPath} </echo>
     <java
       jar="${launcherPath}"
       failonerror="false"
       dir="${eclipse-home}"
       timeout="900000"
       fork="true"
-      output="${basedir}/director.log"
+      output="${basedir}/director-${extraIU}.log"
+      append="true"
       resultproperty="directorcode">
       <arg line="-vm ${java.home}/bin/java" />
       <arg line="-application org.eclipse.equinox.p2.director" />
       <arg line="-consoleLog" />
+      <arg line="-debug" />
       <arg line="-flavor tooling" />
       <arg line="-installIUs ${extraIU}" />
       <arg line="-p2.os ${os}" />
@@ -375,18 +387,23 @@
       name="launcherPath"
       refid="launcher.paths" />
     <antcall target="setupPlatform" />
-    <echo>-installIU ${testPlugin} +</echo>
+    <echo>-installTestIU ${testPlugin} +</echo>
+    <echo>   from ${repoLocation} </echo>
+    <echo>   into ${eclipse-home} </echo>
+    <echo>   using launcher: ${launcherPath} </echo>
     <java
       jar="${launcherPath}"
       failonerror="false"
       dir="${eclipse-home}"
       timeout="900000"
       fork="true"
-      output="${basedir}/director.log"
+      output="${basedir}/director-${testPlugin}.log"
+      append="true"
       resultproperty="directorcode">
       <arg line="-vm ${java.home}/bin/java" />
       <arg line="-application org.eclipse.equinox.p2.director" />
       <arg line="-consoleLog" />
+      <arg line="-debug" />
       <arg line="-flavor tooling" />
       <arg
         line="-installIUs ${testPlugin},org.eclipse.test,org.eclipse.ant.optional.junit,org.eclipse.test.performance,org.eclipse.test.performance.win32,org.easymock" />
@@ -1419,9 +1436,8 @@
         relatively quick, and realtively reliable on build.eclipse.org hardware
     -->
   <target name="platform">
-    <!-- remove for now, bug 400385
-       <antcall target="relEng" />
-    -->
+    <!-- relEng tests were removed long ago, for bug 400385 -->
+    <antcall target="relEng" />
     <antcall target="ant" />
     <antcall target="antui" />
     <antcall target="compare" />