Bug 532933 - Add new test configuration that runs with Java 10

Change-Id: I6c02f3df051a668f9a8f212d5b78f9b38d87ab02
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

4 files changed, 6 insertions, 6 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index 9dfbf1ded..91206185d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -245,7 +245,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9_linux.gtk.x86_64_9" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10_linux.gtk.x86_64_10" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
index cfdc4d65f..fe0a6646b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -268,7 +268,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java9_linux.gtk.x86_64_9" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk2_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10_linux.gtk.x86_64_10" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
index 977cb272c..f12fdeb00 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -12,7 +12,7 @@ include("buildproperties.php");
 $expectedTestConfigs = array();
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk2_linux.gtk.x86_64_8.0";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3_linux.gtk.x86_64_8.0";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java9_linux.gtk.x86_64_9";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java10_linux.gtk.x86_64_10";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64_macosx.cocoa.x86_64_8.0";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32_win32.win32.x86_8.0";
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
index b709599bb..8b5ad4806 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
@@ -114,9 +114,9 @@ function calcTestConfigsRan($testResultsDirName) {
               $jobname=jobname($expectedTestConfigs[$i]);
               //echo "DEBUG: jobname: " . $jobname;
               if (substr_startswith($summFileName, $testResultsDirName."/".$jobname)) {
-                $summFileJava9=strpos($summFileName, "java9");
-                $jobnameJava9=strpos($testResultsDirName."/".$jobname, "java9");
-                if ($summFileJava9 == $jobnameJava9 ) {
+                $summFileJava10=strpos($summFileName, "java10");
+                $jobnameJava10=strpos($testResultsDirName."/".$jobname, "java10");
+                if ($summFileJava10 == $jobnameJava10 ) {
                   //echo "DEBUG: found matching summary file: $summFileName<br />";
                   $xmlResults = simplexml_load_file($summFileName);
                   $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration;