Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-09-13 10:56:10 +0000
committerSravan Kumar Lakkimsetti2019-09-16 05:43:49 +0000
commitd773a5b7126e7fe89cf780f72d8f5cecfdc3b418 (patch)
tree5c59de4d2fc3b98c3bba1b34b1e986745572716d
parent931bab9a570d455d9e12325cb31c646a63798602 (diff)
downloadeclipse.platform.releng.aggregator-d773a5b7126e7fe89cf780f72d8f5cecfdc3b418.tar.gz
eclipse.platform.releng.aggregator-d773a5b7126e7fe89cf780f72d8f5cecfdc3b418.tar.xz
eclipse.platform.releng.aggregator-d773a5b7126e7fe89cf780f72d8f5cecfdc3b418.zip
Bug 547713 - [13] Running Y build with Java 13 compiler for test results
Change-Id: Ide431fd7c3bdb2d06e327559648bec943a348997 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml146
1 files changed, 140 insertions, 6 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index e54d3426b..4a0355453 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1029,6 +1029,12 @@
<matches
string="${java.version}"
pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</or>
</condition>
<condition
@@ -1047,6 +1053,12 @@
<matches
string="${java.version}"
pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</or>
</condition>
<condition
@@ -1065,6 +1077,12 @@
<matches
string="${java.version}"
pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</or>
</condition>
<condition
@@ -1083,6 +1101,12 @@
<matches
string="${java.version}"
pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</or>
</condition>
<condition
@@ -1098,6 +1122,12 @@
<matches
string="${java.version}"
pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</or>
</condition>
<condition
@@ -1110,20 +1140,59 @@
<matches
string="${java.version}"
pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</or>
</condition>
<condition
property="J2SE-11.0"
value="${java.home}/bin/java">
- <matches
- string="${java.version}"
- pattern="^[11].*$" />
+ <or>
+ <matches
+ string="${java.version}"
+ pattern="^[11].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
+ </or>
+ </condition>
+ <condition
+ property="J2SE-12.0"
+ value="${java.home}/bin/java">
+ <or>
+ <matches
+ string="${java.version}"
+ pattern="^[12].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
+ </or>
+ </condition>
+ <condition
+ property="J2SE-13.0"
+ value="${java.home}/bin/java">
+ <matches
+ string="${java.version}"
+ pattern="^[13].*$" />
</condition>
<echo
level="info"
message="DEBUG: values from setJVMProperties" />
<echo
level="info"
+ message="J2SE-13.0: ${J2SE-13.0}" />
+ <echo
+ level="info"
+ message="J2SE-12.0: ${J2SE-12.0}" />
+ <echo
+ level="info"
message="J2SE-11.0: ${J2SE-11.0}" />
<echo
level="info"
@@ -1166,11 +1235,38 @@
<echo message="${javaversion}" />
<condition
+ property="J2SE-13.0"
+ value="${jvm}">
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
+ </condition>
+ <condition
+ property="J2SE-12.0"
+ value="${jvm}">
+ <or>
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
+ </or>
+ </condition>
+ <condition
property="J2SE-11.0"
value="${jvm}">
- <matches
- string="${javaversion}"
- pattern='.*version "[11].*"' />
+ <or>
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
+ </or>
</condition>
<condition
property="J2SE-10.0"
@@ -1182,6 +1278,12 @@
<matches
string="${javaversion}"
pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
</or>
</condition>
<condition
@@ -1197,6 +1299,12 @@
<matches
string="${javaversion}"
pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
</or>
</condition>
<condition
@@ -1215,6 +1323,12 @@
<matches
string="${javaversion}"
pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
</or>
</condition>
<condition
@@ -1233,6 +1347,12 @@
<matches
string="${javaversion}"
pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
</or>
</condition>
<condition
@@ -1251,6 +1371,12 @@
<matches
string="${javaversion}"
pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
</or>
</condition>
<condition
@@ -1269,11 +1395,19 @@
<matches
string="${javaversion}"
pattern='.*version "[11].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[12].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='.*version "[13].*"' />
</or>
</condition>
<echo
level="info"
message="DEBUG: values from setJVMfromUserSpecified" />
+ <echo message="J2SE-13.0: ${J2SE-13.0}" />
+ <echo message="J2SE-12.0: ${J2SE-12.0}" />
<echo message="J2SE-11.0: ${J2SE-11.0}" />
<echo message="J2SE-10.0: ${J2SE-10.0}" />
<echo message="J2SE-9.0: ${J2SE-9.0}" />

Back to the top