[releng] first steps of improving labels.

reverting attempt to avoid global init.

1 files changed, 86 insertions, 110 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index d92b8218a..b3e748764 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -4,6 +4,80 @@
   default="all"
   basedir=".">
 
+  <!--
+     Should be able to record "hudson slave" as part of test results?
+     Or, if that's not defined, perhaps simply "hostname"? 
+  -->
+  <property environment="env" />
+
+  <!--properties file containing the build information-->
+  <property file="label.properties" />
+  <!-- 
+    properties file containing the plugin directory name including version number,
+    and list of required test plug-ins expressed as command-line argument to unzip executable.
+    Generated and packaged at build time.
+  -->
+  <property file="test.properties" />
+  <!--
+    Try using "loadproperties", instead of "properties file=" to see if
+    that will "evaluate" variables as loaded. Otherwise, the <properties form
+    has to move to "top of file" ... outer scope?
+   <property file="${eclipseBuilderDir}/eclipse/buildConfigs/sdk.tests/testConfigs/${testPlatform}/testing.properties" />
+-->
+  <property
+    name="testingPropertiesfile"
+    value="testing.properties" />
+  <loadproperties>
+    <file file="${testingPropertiesfile}" />
+  </loadproperties>
+
+
+  <!--default directory where test-eclipse will be installed-->
+  <property
+    name="install"
+    value="${basedir}/test-eclipse" />
+
+  <!--suffix added to test output files to identify platform on which tests ran.-->
+  <property
+    name="platform"
+    value="${os}.${ws}.${arch}" />
+
+  <!-- The root of the eclipse installation -->
+  <property
+    name="eclipse-home"
+    value="${install}/eclipse" />
+
+  <property
+    name="repoZip"
+    value="${basedir}/eclipse-junit-tests-${buildId}.zip" />
+  <property
+    name="repoLocation"
+    value="${basedir}/testRepo" />
+  <property
+    name="platformLocation"
+    value="${basedir}/platformLocation" />
+
+  <!-- The directory that will contain all files containing information on the tests that ran.-->
+  <property
+    name="results"
+    value="${basedir}/results" />
+
+  <!--Directory for JUnit report output, console log output and .log content for each test suite.
+            Overrides default in org.eclipse.test/library.xml-->
+  <property
+    name="junit-report-output"
+    value="${results}/${platform}" />
+
+  <!-- this dirctory, with some sort files are created during unit tests
+    ... need to find where to disable jacoco -->
+  <property
+    name="coverage-output"
+    value="${results}/coverageIGNORE" />
+
+  <echo
+    level="debug"
+    message="DEBUG: org.eclipse.core.net.prefs: ${org.eclipse.core.net.prefs}" />
+
   <!--Directory name of org.eclipse.test plug-in installed in ${eclipse-home}-->
   <target
     name="setup"
@@ -56,9 +130,7 @@
     <antcall target="installPreferences" />
   </target>
 
-  <target 
-    name="installPreferences"
-    depends="init">
+  <target name="installPreferences">
     <property
       name="preferenceDirectory"
       value="${install}/eclipse/configuration/.settings/" />
@@ -71,7 +143,6 @@
 
   <target
     name="installNetworkPreferences"
-    depends="init"
     if="org.eclipse.core.net.prefs">
 
     <copy
@@ -85,7 +156,6 @@
   <!--Extract test bundles repo -->
   <target
     name="setupRepo"
-    depends="init"
     unless="repoexists">
     <mkdir dir="${repoLocation}" />
     <exec
@@ -98,7 +168,6 @@
   <!--setup for zip archives-->
   <target
     name="setup-zip"
-    depends="init"
     description="Reinstall the test Eclipse installation if specified by user">
     <delete dir="${install}" />
     <mkdir dir="${install}" />
@@ -114,7 +183,6 @@
   <!--setup for tar.gz archives-->
   <target
     name="setup-tar.gz"
-    depends="init"
     description="Reinstall the test Eclipse installation if specified by user">
     <property
       name="currentDir"
@@ -131,9 +199,7 @@
   </target>
 
   <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
-  <target 
-    name="setupPlatform"
-    depends="init">
+  <target name="setupPlatform">
     <echo message="os.arch ${os.arch}" />
     <loadproperties srcfile="equinoxp2tests.properties" />
     <condition
@@ -235,7 +301,6 @@
   <!--setup for platform zip archives-->
   <target
     name="platform-zip"
-    depends="init"
     description="Reinstall the test Eclipse installation if specified by user">
     <delete dir="${platformLocation}" />
     <mkdir dir="${platformLocation}" />
@@ -249,7 +314,6 @@
   <!--setup for platform tar.gz archives-->
   <target
     name="platform-tar.gz"
-    depends="init"
     description="Reinstall the test Eclipse installation if specified by user">
     <delete dir="${platformLocation}" />
     <mkdir dir="${platformLocation}" />
@@ -262,7 +326,6 @@
 
   <target
     name="installExtraPlugins"
-    depends="init"
     if="extraIU">
     <loadproperties srcfile="equinoxp2tests.properties" />
     <path id="launcher.paths">
@@ -302,9 +365,7 @@
     </java>
   </target>
 
-  <target 
-    name="installTestPlugins"
-    depends="init">
+  <target name="installTestPlugins">
     <path id="launcher.paths">
       <fileset
         dir="${eclipse-home}"
@@ -344,7 +405,6 @@
 
   <target
     name="unzipderby"
-    depends="init"
     if="derby"
     unless="skipDerby">
     <exec
@@ -361,83 +421,7 @@
 
   <target
     name="init"
-    depends="setRuntimeArchive"
-    unless="overallInitComplete">
-
-    <!--
-       Should be able to record "hudson slave" as part of test results?
-       Or, if that's not defined, perhaps simply "hostname"?
-    -->
-    <property environment="env" />
-
-    <!--properties file containing the build information-->
-    <property file="label.properties" />
-    <!--
-      properties file containing the plugin directory name including version number,
-      and list of required test plug-ins expressed as command-line argument to unzip executable.
-      Generated and packaged at build time.
-    -->
-    <property file="test.properties" />
-    <!--
-      Try using "loadproperties", instead of "properties file=" to see if
-      that will "evaluate" variables as loaded. Otherwise, the <properties form
-      has to move to "top of file" ... outer scope?
-     <property file="${eclipseBuilderDir}/eclipse/buildConfigs/sdk.tests/testConfigs/${testPlatform}/testing.properties" />
-  -->
-    <property
-      name="testingPropertiesfile"
-      value="testing.properties" />
-    <loadproperties>
-      <file file="${testingPropertiesfile}" />
-    </loadproperties>
-
-
-    <!--default directory where test-eclipse will be installed-->
-    <property
-      name="install"
-      value="${basedir}/test-eclipse" />
-
-    <!--suffix added to test output files to identify platform on which tests ran.-->
-    <property
-      name="platform"
-      value="${os}.${ws}.${arch}" />
-
-    <!-- The root of the eclipse installation -->
-    <property
-      name="eclipse-home"
-      value="${install}/eclipse" />
-    <mkdir dir="{eclipse-home}" />
-    <property
-      name="repoZip"
-      value="${basedir}/eclipse-junit-tests-${buildId}.zip" />
-    <property
-      name="repoLocation"
-      value="${basedir}/testRepo" />
-    <property
-      name="platformLocation"
-      value="${basedir}/platformLocation" />
-
-    <!-- The directory that will contain all files containing information on the tests that ran.-->
-    <property
-      name="results"
-      value="${basedir}/results" />
-
-    <!--Directory for JUnit report output, console log output and .log content for each test suite.
-              Overrides default in org.eclipse.test/library.xml-->
-    <property
-      name="junit-report-output"
-      value="${results}/${platform}" />
-
-    <!-- this dirctory, with some sort files are created during unit tests
-      ... need to find where to disable jacoco -->
-    <property
-      name="coverage-output"
-      value="${results}/coverageIGNORE" />
-
-    <echo
-      level="debug"
-      message="DEBUG: org.eclipse.core.net.prefs: ${org.eclipse.core.net.prefs}" />
-
+    depends="setRuntimeArchive">
     <mkdir dir="${results}/xml" />
     <mkdir dir="${results}/html" />
     <mkdir dir="${junit-report-output}" />
@@ -450,10 +434,7 @@
       <arg line="-R nouchg ${install}" />
     </exec>
 
-    <antcall
-       target="printMainProperties">
-    </antcall>
-    <property name="overallInitComplete" value="true" />
+    <antcall target="printMainProperties" />
 
   </target>
 
@@ -762,7 +743,6 @@
   </target>
   <target
     name="configureTeamTest"
-    depends="init"
     if="teamcvs">
     <!-- Fill in cvs repository information -->
     <replace
@@ -785,7 +765,6 @@
 
   <target
     name="configureDeltaPack"
-    depends="init"
     if="pdebuild">
     <property
       name="deltapackArchive"
@@ -858,7 +837,6 @@
 
   <target
     name="junit"
-    depends="init"
     unless="skip.test">
     <antcall target="setup">
     </antcall>
@@ -894,7 +872,6 @@
 
   <target
     name="runSuite"
-    depends="init"
     if="pluginexists">
     <ant
       antfile="${eclipse-home}/plugins/${testPluginX}"
@@ -904,7 +881,6 @@
 
   <target
     name="runSuitePerf"
-    depends="init"
     if="pluginexists">
     <echo message="testPluginX ${testPluginX}" />
     <property
@@ -918,7 +894,6 @@
 
   <target
     name="performance"
-    depends="init"
     if="performance.target.present"
     unless="skip.test">
     <antcall target="setup" />
@@ -950,9 +925,7 @@
     <antcall target="genResults" />
   </target>
 
-  <target 
-    name="genResults"
-    depends="init">
+  <target name="genResults">
     <copy
       file="${eclipse-home}/${report}.xml"
       tofile="${results}/xml/${report}_${platform}.xml"
@@ -971,7 +944,7 @@
   <target
     name="convertToHTML"
     if="stylesheetexists"
-    depends="checkStylesheetexists,init">
+    depends="checkStylesheetexists">
     <xslt
       style="${junit-stylesheet}"
       basedir="${results}/xml"
@@ -1052,7 +1025,7 @@
 
   <target
     name="relEng"
-    depends="init,setRuntimeArchive">
+    depends="setRuntimeArchive">
     <runTests testPlugin="org.eclipse.releng.tests" />
     <move
       todir="${results}/chkpii"
@@ -1578,7 +1551,8 @@
   </target>
 
   <target name="printMainProperties"
-    depends="setJVMProperties">
+    depends="setJVMProperties"
+    unless="printedMainProperties">
 
     <!-- properties to use on test results summary, to be sure accurate -->
     <property
@@ -1652,6 +1626,8 @@
       message="HUDSON_WORKSPACE=${env.WORKSPACE}"
       append="true"
       file="${platformResults}/testProperties.php" />
+  
+    <property name="printedMainProperties" value="true" />
 
     </target>
 </project>