[I-Build-Tests] Inline 'testAll' scripts

eclipse-platform · Nov 30, 2024 · 7b384ce · 7b384ce
1 parent b666509
commit 7b384ce
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 152 deletions.
diff --git a/JenkinsJobs/AutomatedTests/I_unit_mac.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
@@ -38,7 +38,6 @@ pipeline {
               ANT_HOME = tool(type:'ant', name:'apache-ant-latest')
               PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"
               ANT_OPTS = "-Djava.io.tmpdir=${WORKSPACE}/tmp -Djava.security.manager=allow"
-              eclipseArch = \'''' + ARCH + ''''
           }
           steps {
               cleanWs() // workspace not cleaned by default
@@ -75,7 +74,7 @@ java -XshowSettings -version 1>javaSettings.txt 2>&1
 
 ant -f getEBuilder.xml -DbuildId=${buildId} -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH} \\
   -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\
-  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=${eclipseArch} \\
+  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=''' + ARCH + ''' \\
   -DtestSuite=all
 # For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903
               \'\'\'

diff --git a/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy b/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy
@@ -78,7 +78,6 @@ echo JAVA_HOME: $JAVA_HOME
 echo PATH: $PATH
 
 export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp ${secManager}"
-export eclipseArch=aarch64
 
 env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1

diff --git a/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy b/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy
@@ -80,7 +80,6 @@ echo JAVA_HOME: $JAVA_HOME
 echo PATH: $PATH
 
 export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp ${secMananger}"
-export eclipseArch=ppc64le
 
 env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1

diff --git a/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy
@@ -120,7 +120,6 @@ env  1>envVars.txt 2>&1
 ant -diagnostics  1>antDiagnostics.txt 2>&1
 java -XshowSettings -version  1>javaSettings.txt 2>&1
 
-export eclipseArch=x86_64
 ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId  -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DtestSuite=${testSuite}
 
 RAW_DATE_END="$(date +%s )"

diff --git a/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy
@@ -113,9 +113,6 @@ echo JAVA_HOME: $JAVA_HOME
 echo ANT_HOME: $ANT_HOME
 echo PATH: $PATH
 
-export eclipseArch=aarch64
-
-
 env  1>envVars.txt 2>&1
 ant -diagnostics  1>antDiagnostics.txt 2>&1
 java -XshowSettings -version  1>javaSettings.txt 2>&1

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties
@@ -20,7 +20,7 @@
 testExecutable=bash
 
 #name of script to execute
-testScript=./testAll.sh
+testScript=./runtests.sh
 
 # This value gets written to the "preference file", named org.eclipse.core.net.prefs.
 # We implement as a property string, since eventually we may test multiple proxy settings.

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
diff --git a/...uction/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties b/...uction/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
@@ -26,7 +26,7 @@ loglocationarg=-XX:ErrorFile
 testExecutable=bash
 
 #name of script to execute
-testScript=./testAll.sh
+testScript=./runtestsmac.sh
 
 # This value gets written to the "preference file", named org.eclipse.core.net.prefs.
 # We implement as a property string, since eventually we may test multiple proxy settings.

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
diff --git a/...ction/testScripts/configuration/sdk.tests/testConfigs/windows/platformSpecific.properties b/...ction/testScripts/configuration/sdk.tests/testConfigs/windows/platformSpecific.properties
@@ -21,7 +21,7 @@ testExecutable=cmd
 
 #name of script to execute
 
-testScript=testAll.bat
+testScript=runtests.bat
 
 # This value gets written to the "preference file", named org.eclipse.core.net.prefs.
 # We implement as a property string, since eventually we may test multiple proxy settings.

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/windows/testAll.bat b/production/testScripts/configuration/sdk.tests/testConfigs/windows/testAll.bat
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
@@ -816,15 +816,18 @@
     depends="init"
     unless="env.TESTING_TEST_XML">
 
+    <mkdir dir="results/consolelogs"/>
+    <chmod file="${testScript}" perm="755"/>
     <!--run the tests -->
     <exec
       dir="${executionDir}"
-      executable="${testExecutable}">
+      executable="${testExecutable}"
+      output="results/consolelogs/${testedPlatform}_consolelog.txt">
       <arg line="${executionArguments}" />
+      <arg line="-os ${osgi.os} -ws ${osgi.ws} -arch ${osgi.arch}"/>
+      <arg value="-vm"/><arg path="${jvm}"/>
+      <arg value="-properties"/><arg path="${WORKSPACE}/production.properties"/>
       <arg value="${testSuite}" />
-      <env
-        key="propertyFile"
-        file="${WORKSPACE}/production.properties" />
       <env
         key="jvm"
         file="${jvm}" />