--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2017-04-19 12:47:51.000000000 +0100

+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2017-04-19 20:15:38.781348810 +0100

@@ -39,21 +39,6 @@

         arg1="${testPlugin}"

         arg2="org.eclipse.equinox.p2.tests.discovery" />

     </condition>

-    

-      property="extraIU"

-      value="org.eclipse.osgi.compatibility.plugins.feature.feature.group">

-      <or>

-        

-          arg1="${testPlugin}"

-          arg2="org.eclipse.osgi.tests" />

-        

-          arg1="${testPlugin}"

-          arg2="org.eclipse.pde.ui.tests" />

-        

-          arg1="${testPlugin}"

-          arg2="org.eclipse.pde.api.tools.tests" />

-      </or>

-    </condition>

     <antcall target="setupRepo" />

     <antcall target="${setupTarget}" />

@@ -61,7 +46,7 @@

     <antcall target="installPreferences">

         name="eclipse-home"

-        value="${eclipse-home}/eclipse" />

+        value="${eclipse-home}" />

     </antcall>

     <antcall target="installExtraPlugins" />

     <antcall target="installTestPlugins" />

@@ -96,19 +81,6 @@

     name="setupRepo"

     depends="init"

     unless="testRepoCreated">

-    <mkdir dir="${repoLocation}" />

-    

-      dir="${basedir}"

-      executable="unzip"

-      failonerror="false"

-      resultproperty="unzipResultCode">

-      <arg value="-o" />

-      <arg value="-qq" />

-      <arg value="${repoZip}" />

-      <arg value="-d" />

-      <arg value="${repoLocation}" />

-    </exec>

-    <echo message="unzip resultcode: ${unzipResultCode}" />

       name="testRepoCreated"

@@ -128,8 +100,9 @@

       message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />

     <echo message="Deleting existing ${eclipse-home}, if any." />

-      dir="${eclipse-home}"

-      verbose="false" />

+      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">

+      <fileset dir="${eclipse-home}" followsymlinks="false" />

+    </delete>

     <echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />

       dir="${install}"

@@ -155,9 +128,9 @@

       message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />

     <echo message="Deleting existing ${eclipse-home}, if any." />

-      dir="${eclipse-home}"

-      verbose="false" />

-

+      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">

+      <fileset dir="${eclipse-home}" followsymlinks="false" />

+    </delete>

     <echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />

       dir="${install}"

@@ -309,8 +282,9 @@

       message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />

-      verbose="false"

-      dir="${platformLocation}/eclipse" />

+      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">

+      <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />

+    </delete>

       dir="${platformLocation}"

       executable="unzip">

@@ -333,11 +307,10 @@

       unless="platformArchiveExists"

       message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />

-

-

-      verbose="false"

-      dir="${platformLocation}/eclipse" />

+      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">

+      <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />

+    </delete>

       dir="${platformLocation}"

       executable="tar">

@@ -561,7 +534,7 @@

     unless="currentUpdateSite">

       name="currentUpdateSite"

-      value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" />

+      value="file:${repoLocation}" />

   </target>

     name="initStreamSpecificProperties"

@@ -808,7 +781,7 @@

     name="init"

-    depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"

+    depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories, initCurrentUpdateSite, initOSes, initPlatformArhiveName, setRuntimeArchive"

     unless="testingIsInitialized">

     <property environment="env" />

@@ -823,7 +796,7 @@

       name="current.build.repo"

-      value="http://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}" />

+      value="file:${repoLocation}" />

     <echo message="current.build.repo: ${current.build.repo}" />

@@ -1887,6 +1860,7 @@

     -->

     <antcall target="quickTests" />

     <antcall target="longRunningTests" />

+    <antcall target="mergeAllTestResults" />

   </target>

@@ -1948,6 +1922,8 @@

     <antcall target="jdttext" />

     <antcall target="jdtuirefactoring" />

   </target>

+  <target name="distroCustomTests" depends="init">

+  </target>

     name="quickTests"

     depends="init">

@@ -2057,6 +2033,20 @@

   </target>

+  

+    name="mergeAllTestResults"

+    depends="init">

+    

+    <mkdir dir="${results}/split-xml" />

+    <xslt style="${executionDir}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/split-xml"/>

+    

+    <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">

+      <fileset dir="${results}/split-xml" includes="*.xml" />

+    </junitreport>

+    

+    <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />

+  </target>

+

     admittedly, not quite all of 'platform', but for

     now serves dual purpose of a "short set" of tests, that area

@@ -2065,8 +2055,6 @@

     name="platform"

     depends="init">

-    

-    <antcall target="relEng" />

     <antcall target="ant" />

     <antcall target="antui" />

@@ -2099,7 +2087,6 @@

     <antcall target="e4CssSwt" />

     <antcall target="e4UI" />

     <antcall target="equinoxds" />

-    <antcall target="equinoxp2discovery" />

     <antcall target="bidi" />

     <antcall target="ltkuirefactoringtests" />

     <antcall target="ltkcorerefactoringtests" />

@@ -2115,7 +2102,6 @@

     <antcall target="osgi" />

     <antcall target="coreresources" />

     <antcall target="equinoxp2" />

-    <antcall target="teamcvs" />

     <antcall target="jface" />

     <antcall target="ui" />

     <antcall target="uiperformance" />

--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig	2017-03-03 12:36:38.576140783 +0000

+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh	2017-03-03 12:40:39.324608342 +0000

@@ -6,6 +6,45 @@

 # version. 

 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=437069

+function findXvncAndSetDisplay() {

+    # Try to find Xvnc

+    xvnc=

+    if [ -a /usr/bin/Xvnc ]

+    then

+        xvnc=/usr/bin/Xvnc

+        setupXvnc

+    else

+        if [ -a /usr/X11/bin/Xvnc ]

+        then

+            xvnc=/usr/X11/bin/Xvnc

+            setupXvnc

+        else

+            echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc).  Using DISPLAY=0:0"

+            DISPLAY=$($HOST):0.0

+        fi

+    fi

+    export DISPLAY

+}

+

+function setupXvnc() {

+    # Pick a high display number.

+    port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`

+    echo localhost > Xvnc.cfg

+    echo "Setting up Xvnc on port ${port} with password VNCpassword1"

+    $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &

+    Xvncpid=$!

+    DISPLAY=$($HOST):$port

+}

+

+function cleanupXvnc() {

+    # Clean up if we used Xvnc

+    if [ -e Xvnc.cfg ]

+    then

+        kill $Xvncpid

+        rm Xvnc.cfg

+    fi

+}

+

 echo "command line as passed into $(basename ${0}): ${*}"

 echo "command line (quoted) as passed into $(basename ${0}): ${@}"

@@ -166,6 +205,8 @@

 if [[ "true" == "${START_WINDOW_MGT}" ]]

 then 

  ./startWindowManager.sh

+else

+ findXvncAndSetDisplay

 fi

 # During production tests, we define 'testedPlatform' as a combination of

@@ -199,6 +240,7 @@

 echo "platformString: ${platformString}"

 echo "testedPlatform: ${testedPlatform}"

+ANT_OPTS="${ANT_OPTS} -DtestedPlatform=${testedPlatform}"

 # -Dtimeout=300000 "${ANT_OPTS}"

 if [[ -n "${extdirproperty}" ]]

 then

@@ -209,4 +251,4 @@

   $jvm ${ANT_OPTS} ${platformArgString}  -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml  ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger  $tests 2>&1 | tee $consolelogs

 fi

-

+cleanupXvnc

--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig	2017-04-19 19:39:39.382960089 +0100

+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml	2017-04-19 20:04:36.088575077 +0100

@@ -137,6 +137,15 @@

             name="formatter"

             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />

+        

+        <condition property="testproduct.if.available" value="-product ${testProduct}">

+            <isset property="testProduct" />

+        </condition>

+        <property name="testproduct.if.available" value="" />

+        <condition property="testapplication.if.available" value="-testApplication ${testApplication}">

+            <isset property="testApplication" />

+        </condition>

+        <property name="testapplication.if.available" value="" />

         <tstamp prefix="NOW" />

@@ -196,6 +205,17 @@

     </target>

+        name="swtbot-test"

+        description="Eclipse application used to launch SWTBOT plugin tests."

+        depends="init">

+        <antcall target="${launchTarget}">

+            

+                name="application"

+                value="org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication" />

+        </antcall>

+    </target>

+

+    

         name="java-test"

         depends="init">

@@ -258,7 +278,7 @@

                     <include name="org.eclipse.equinox.launcher_*.jar" />

                 </fileset>

             </classpath>

-            <arg line="-application ${application}" />

+            <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />

             <arg line="-data ${data-dir}" />

             <arg line="formatter=${formatter},${test-output}" />

             <arg line="-testPluginName ${plugin-name}" />

@@ -329,7 +349,7 @@

             output="${junit-report-output}/${classname}.txt">

             <arg line="-data ${data-dir}" />

             <arg line="${test-vm}" />

-            <arg line="-application ${application}" />

+            <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />

             <arg line="formatter=${formatter},${test-output}" />

             <arg line="-testPluginName ${plugin-name}" />

             <arg line="-className ${classname}" />