Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-03-21 02:25:32 -0400
committerSravan Kumar Lakkimsetti2019-03-21 02:25:32 -0400
commit81587bfe4394ed24cff888ad847b25daa9c9e1bc (patch)
tree4053099f4ac66a295f4457d26eaf18016b56d30a
parentadb440a647e18a97483acfbbadfb06fe1890ab39 (diff)
downloadeclipse.platform.releng.aggregator-81587bfe4394ed24cff888ad847b25daa9c9e1bc.tar.gz
eclipse.platform.releng.aggregator-81587bfe4394ed24cff888ad847b25daa9c9e1bc.tar.xz
eclipse.platform.releng.aggregator-81587bfe4394ed24cff888ad847b25daa9c9e1bc.zip
Bug 543770 - [12] Run one configuration of I-build tests on java 12
Change-Id: I95de6e1e8e2e38c3ef5182d0216f0ebbdeb7fd58 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php16
4 files changed, 9 insertions, 13 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index e49b1b98..ee8f544b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -248,7 +248,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java8_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java8_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java8_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java8_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java12_linux.gtk.x86_64_12" />
<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 107842a1..def592f5 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -271,7 +271,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java8_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java8_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java8_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java8_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java8_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java12_linux.gtk.x86_64_12" />
<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 d0542a3c..6ff0ae7b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -14,4 +14,4 @@ $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-java8_macosx.cocoa.x86_64_8.0";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-java8_win32.win32.x86_64_8.0";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java11_linux.gtk.x86_64_11";
-
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java12_linux.gtk.x86_64_12";
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
index a510077e..ef1e985a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
@@ -114,16 +114,12 @@ function calcTestConfigsRan($testResultsDirName) {
$jobname=jobname($expectedTestConfigs[$i]);
//echo "DEBUG: jobname: " . $jobname;
if (substr_startswith($summFileName, $testResultsDirName."/".$jobname)) {
- $summFileJava11=strpos($summFileName, "java11");
- $jobnameJava11=strpos($testResultsDirName."/".$jobname, "java11");
- if ($summFileJava11 == $jobnameJava11 ) {
- //echo "DEBUG: found matching summary file: $summFileName<br />";
- $xmlResults = simplexml_load_file($summFileName);
- $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration;
- $testResults[$expectedTestConfigs[$i]]["failCount"]=$xmlResults->failCount;
- $testResults[$expectedTestConfigs[$i]]["passCount"]=$xmlResults->passCount;
- $testResults[$expectedTestConfigs[$i]]["skipCount"]=$xmlResults->skipCount;
- }
+ //echo "DEBUG: found matching summary file: $summFileName<br />";
+ $xmlResults = simplexml_load_file($summFileName);
+ $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration;
+ $testResults[$expectedTestConfigs[$i]]["failCount"]=$xmlResults->failCount;
+ $testResults[$expectedTestConfigs[$i]]["passCount"]=$xmlResults->passCount;
+ $testResults[$expectedTestConfigs[$i]]["skipCount"]=$xmlResults->skipCount;
}
}
}

Back to the top