Bug 390821 - Performance testing back end on eclipse.org

3 files changed, 37 insertions, 11 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 578e96e90..8b6b602d0 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -132,7 +132,7 @@
     <exec
       dir="${install}"
       executable="unzip">
-      <arg line="${executionDir}/${runtimeArchive} -d ${install}" />
+      <arg line=" -q ${executionDir}/${runtimeArchive} -d ${install}" />
     </exec>
 
   </target>
@@ -157,7 +157,7 @@
     <exec
       dir="${install}"
       executable="tar">
-      <arg line="-xvzf ${executionDir}/${runtimeArchive} -C ${install}" />
+      <arg line="-xf ${executionDir}/${runtimeArchive} -C ${install}" />
     </exec>
 
   </target>
@@ -295,7 +295,7 @@
     <exec
       dir="${platformLocation}"
       executable="unzip">
-      <arg line=" ${platformLocation}/${platformArchive} -d ${platformLocation}" />
+      <arg line=" -q ${platformLocation}/${platformArchive} -d ${platformLocation}" />
     </exec>
   </target>
 
@@ -318,7 +318,7 @@
     <exec
       dir="${platformLocation}"
       executable="tar">
-      <arg line="-xvzf ${platformLocation}/${platformArchive} -C ${platformLocation}" />
+      <arg line="-xf ${platformLocation}/${platformArchive} -C ${platformLocation}" />
     </exec>
   </target>
 
@@ -1355,7 +1355,7 @@
 
 
   <target
-    name="runSuitePerf"
+    name="runSuitePerf" 
     depends="initStreamVariables"
     if="pluginexists">
     <echo message="testPluginX ${testPluginX}" />
@@ -1381,6 +1381,7 @@
     <condition property="frameworkperfargs" value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
       <isset property="eclipse.perf.assertAgainst"/>
     </condition>
+    
     <ant
       antfile="${eclipse-home}/plugins/${testPluginX}"
       dir="${eclipse-home}"
diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index d7ee64234..f9237a791 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -180,9 +180,12 @@
       name="JSON_EBUILDER_HASH"
       value="{&quot;name&quot;:&quot;EBUILDER_HASH&quot;,&quot;value&quot;:&quot;${EBUILDER_HASH}&quot;}" />
 
+    <property name="JSON_defaultTestSuite" 
+      value="{&quot;name&quot;:&quot;testToRun&quot;,&quot;value&quot;:&quot;selectPerformance&quot;}" />
+
     <property
       name="json"
-      value="{&quot;parameter&quot;: [${JSON_buildId},${JSON_eclipseStream},${JSON_EBUILDER_HASH}] }" />
+      value="{&quot;parameter&quot;: [${JSON_buildId},${JSON_eclipseStream},${JSON_EBUILDER_HASH}, ${defaultTestSuite} ] }" />
 
     <!-- TODO: "segment" varies by test, and/or environment ... must be an easier way? -->
     <property
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 9aa99980f..6124664ab 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -21,9 +21,9 @@
          but this allows us to be explicit (and, make sure it 
          continues working).
     -->
-    <property
-      name="testSuite"
-      value="all" />
+    <condition property="testSuite" value="${env.testSuite}" else="all">
+      <isset property="env.testSuite" />
+    </condition>
     <property
       name="buildURL"
       value="http://${DOWNLOAD_HOST}/eclipse/downloads/${dropsDirSegment}/${buildId}" />
@@ -550,6 +550,9 @@
     <printProperty property="javaMajorVersion" />
     <printProperty property="testedPlatform" />
     <printProperty property="eclipse.perf.dbloc" />
+    <printProperty property="eclipse.perf.config" />
+    <printProperty property="eclipse.perf.assertAgainst" />
+    
     <!--
     The following will leave pw in file, which is not a lot different that
     leave them printed in log, as we also do. But, could be improved by just leaving
@@ -623,7 +626,18 @@
     </condition>
 
     <loadproperties srcFile="${configurationDir}/streamSpecific.properties" />
-
+    <property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/>
+    <property name="eclipse.perf.config" value="build=${buildIdToUse};buildId=${buildId};testedPlatform=${testedPlatform}" />
+    <!-- 
+         This "assert" property works, in this contects, because we run baseline first, 
+         where buildIdToUse != buildId (so, no "assert" for that baseline run). 
+    -->
+    <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion}">
+        <equals arg1="${buildIdToUse}" arg2="${buildId}" />
+    </condition>
+    <condition property="frameworkperfargs" value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
+      <isset property="eclipse.perf.assertAgainst"/>
+    </condition>
     <!-- echo a few typically expected properties, to make sure getting right file -->
 
     <echo message="streamSpecificPropertiesTitle: ${streamSpecificPropertiesTitle}" />
@@ -1062,7 +1076,15 @@
         value="test.target" />
     <printPHPProperty
         phpvar="ECLIPSE_PERF_DBLOC"
-        value="eclipse.perf.dbloc" />    
+        value="eclipse.perf.dbloc" />
+    
+    <printPHPProperty 
+         phpvar="ECLIPSE_PERF_CONFIG"
+        value="eclipse.perf.config" />
+    <printPHPProperty 
+         phpvar="ECLIPSE_PERF_ASSERTAGAINST"
+        value="eclipse.perf.assertAgainst" />
+
      <!--
         We end with an empty line, but it is recommended to not
         end included PHP files with "end PHP" marker.