[93609] Performance: Need a way to verify that WTP plug-ins do not regress...

[93609] Performance: Need a way to verify that WTP plug-ins do not regress Eclipse platform performance

archive/org.eclipse.wtp.releng/buildAll.xml

@@ -445,15 +445,17 @@
 
 
         <target name="eclipsePerf" depends="init">
-            <!-- First run with Eclipse Platform -->
             <property name="perf.dbloc" value="${build.home}/eclipse-perf-db"/>
             <property name="perf.config" value="wtpbuild"/>
             <property name="perf.jvm" value="sun"/>
             <property name="perf.db" value="-Declipse.perf.dbloc=${perf.dbloc}"/>
             <property name="perf.config.base" value="-Declipse.perf.config=config=${perf.config};build=${buildType}${date}-${time}-base;jvm=${perf.jvm}"/>
+            <property name="perf.config.wtp" value="-Declipse.perf.config=config=${perf.config};build=${buildType}${date}-${time}-wtp;jvm=${perf.jvm}"/>
             <property name="perf.assert" value="-Declipse.perf.assertAgainst=config=${perf.config};build=${buildType}${date}-${time}-base;jvm=${perf.jvm}"/>
             <available file="${build.home}/${build.drivers}/${eclipseAutomatedTestsFile}" property="eclipseAutomatedTestsFile.exists"/>
             <antcall target="getEclipseAutomatedTestsFile"/>
+
+            <!-- First run with WTP -->
             <delete dir="${build.home}/${build.perf.tests}" failonerror="false"/>
             <mkdir dir="${build.home}/${build.perf.tests}"/>
             <unzip dest="${build.home}/${build.perf.tests}" src="${build.home}/${build.drivers}/${eclipseAutomatedTestsFile}" overwrite="true"/>
@@ -462,8 +464,14 @@
                     <include name="*.zip"/>
                 </fileset>
             </unzip>
-            <antcall target="eclipsePerfWin"/>
-            <antcall target="eclipsePerfLinux"/>
+            <antcall target="getPreReq"/>
+            <antcall target="setupTestEclipse">
+                <param name="testDir" value="${build.home}/${build.perf.tests}/eclipse-testing/test-eclipse"/>
+            </antcall>
+            <mkdir dir="${buildDirectory}/${buildLabel}"/>
+            <available file="${buildDirectory}/${buildLabel}/wtp-${buildId}.zip" property="wtp.zip.exists"/>
+            <antcall target="getWtpZip"/>
+            <unzip dest="${build.home}/${build.perf.tests}/eclipse-testing/test-eclipse" src="${buildDirectory}/${buildLabel}/wtp-${buildId}.zip" overwrite="true" />
             <antcall target="setupCloudscape">
                 <param name="perfDir" value="${build.home}/${build.perf.tests}/eclipse-testing/test-eclipse"/>
             </antcall>
@@ -474,10 +482,10 @@
                 <property name="arch" value="${basearch}"/>
                 <property name="test.target" value="performance"/>
                 <property name="performance.target.present" value="true"/>
-                <property name="extraVMargs" value="${perf.db} ${perf.config.base} ${perf.assert}"/>
+                <property name="extraVMargs" value="${perf.db} ${perf.config.wtp} ${perf.assert}"/>
             </ant>
-            <!-- Second run with WTP -->
-            <property name="perf.config.wtp" value="-Declipse.perf.config=config=${perf.config};build=${buildType}${date}-${time}-wtp;jvm=${perf.jvm}"/>
+
+            <!-- Second run with Eclipse Platform -->
             <delete dir="${build.home}/${build.perf.tests}" failonerror="false"/>
             <mkdir dir="${build.home}/${build.perf.tests}"/>
             <unzip dest="${build.home}/${build.perf.tests}" src="${build.home}/${build.drivers}/${eclipseAutomatedTestsFile}" overwrite="true"/>
@@ -486,14 +494,8 @@
                     <include name="*.zip"/>
                 </fileset>
             </unzip>
-            <antcall target="getPreReq"/>
-            <antcall target="setupTestEclipse">
-                <param name="testDir" value="${build.home}/${build.perf.tests}/eclipse-testing/test-eclipse"/>
-            </antcall>
-            <mkdir dir="${buildDirectory}/${buildLabel}"/>
-            <available file="${buildDirectory}/${buildLabel}/wtp-${buildId}.zip" property="wtp.zip.exists"/>
-            <antcall target="getWtpZip"/>
-            <unzip dest="${build.home}/${build.perf.tests}/eclipse-testing/test-eclipse" src="${buildDirectory}/${buildLabel}/wtp-${buildId}.zip" overwrite="true" />
+            <antcall target="eclipsePerfWin"/>
+            <antcall target="eclipsePerfLinux"/>
             <antcall target="setupCloudscape">
                 <param name="perfDir" value="${build.home}/${build.perf.tests}/eclipse-testing/test-eclipse"/>
             </antcall>
@@ -504,8 +506,10 @@
                 <property name="arch" value="${basearch}"/>
                 <property name="test.target" value="performance"/>
                 <property name="performance.target.present" value="true"/>
-                <property name="extraVMargs" value="${perf.db} ${perf.config.wtp} ${perf.assert}"/>
+                <property name="extraVMargs" value="${perf.db} ${perf.config.base} ${perf.assert}"/>
             </ant>
+
+            <!-- Generate performance graphs -->
             <mkdir dir="${buildDirectory}/${buildLabel}/eclipsePerfResults"/>
             <ant antfile="testScripts/test.xml" target="genPerfGraphs">
                 <property name="eclipseBuilderDirectory" value="${build.home}/${eclipse.builder}"/>