Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjay2018-06-21 04:36:33 +0000
committerjay2018-06-21 04:41:42 +0000
commitf7b3cd9823d1891eac6908514165a641c22eb6fe (patch)
treefc69800ecbc5a0e27e9c1a93bea2f176b472f7a4 /production
parent9391a79db846234c8ea03ac2783d379731243e3e (diff)
downloadeclipse.platform.releng.aggregator-f7b3cd9823d1891eac6908514165a641c22eb6fe.tar.gz
eclipse.platform.releng.aggregator-f7b3cd9823d1891eac6908514165a641c22eb6fe.tar.xz
eclipse.platform.releng.aggregator-f7b3cd9823d1891eac6908514165a641c22eb6fe.zip
Bug 536072 - [10] JDT Tests failing with JRE 10 in official build
Change-Id: I02e6f6e23ddbfef796de5a57c7e5a1dd2b45158d Signed-off-by: jay <jarthana@in.ibm.com>
Diffstat (limited to 'production')
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml60
1 files changed, 55 insertions, 5 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 421c54f9a..1158702df 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1072,6 +1072,9 @@
<matches
string="${java.version}"
pattern="^[9].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[10].*$" />
</or>
</condition>
<condition
@@ -1084,7 +1087,10 @@
<matches
string="${java.version}"
pattern="^[9].*$" />
- </or>
+ <matches
+ string="${java.version}"
+ pattern="^[10].*$" />
+ </or>
</condition>
<condition
property="J2SE-7.0"
@@ -1096,6 +1102,9 @@
<matches
string="${java.version}"
pattern="^[9].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[10].*$" />
</or>
</condition>
<condition
@@ -1108,20 +1117,36 @@
<matches
string="${java.version}"
pattern="^[9].*$" />
+ <matches
+ string="${java.version}"
+ pattern="^[10].*$" />
</or>
</condition>
- <condition
+ <condition
property="J2SE-9.0"
value="${java.home}/bin/java">
<matches
string="${java.version}"
pattern="^[9].*$" />
- </condition>
+ <matches
+ string="${java.version}"
+ pattern="^[10].*$" />
+ </condition>
+ <condition
+ property="J2SE-10.0"
+ value="${java.home}/bin/java">
+ <matches
+ string="${java.version}"
+ pattern="^[10].*$" />
+ </condition>
<echo
level="info"
message="DEBUG: values from setJVMProperties" />
<echo
level="info"
+ message="J2SE-10.0: ${J2SE-10.0}" />
+ <echo
+ level="info"
message="J2SE-9.0: ${J2SE-9.0}" />
<echo
level="info"
@@ -1158,11 +1183,23 @@
<echo message="${javaversion}" />
<condition
- property="J2SE-9.0"
+ property="J2SE-10.0"
value="${jvm}">
<matches
string="${javaversion}"
- pattern='^java version "[9].*"' />
+ pattern='^java version "[10].*"' />
+ </condition>
+ <condition
+ property="J2SE-9.0"
+ value="${jvm}">
+ <or>
+ <matches
+ string="${javaversion}"
+ pattern='^java version "[9].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='^java version "[10].*"' />
+ </or>
</condition>
<condition
property="J2SE-8.0"
@@ -1174,6 +1211,9 @@
<matches
string="${javaversion}"
pattern='^java version "[9].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='^java version "[10].*"' />
</or>
</condition>
<condition
@@ -1186,6 +1226,9 @@
<matches
string="${javaversion}"
pattern='^java version "[9].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='^java version "[10].*"' />
</or>
</condition>
<condition
@@ -1198,6 +1241,9 @@
<matches
string="${javaversion}"
pattern='^java version "[9].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='^java version "[10].*"' />
</or>
</condition>
<condition
@@ -1210,11 +1256,15 @@
<matches
string="${javaversion}"
pattern='^java version "[9].*"' />
+ <matches
+ string="${javaversion}"
+ pattern='^java version "[10].*"' />
</or>
</condition>
<echo
level="info"
message="DEBUG: values from setJVMfromUserSpecified" />
+ <echo message="J2SE-10.0: ${J2SE-10.0}" />
<echo message="J2SE-9.0: ${J2SE-9.0}" />
<echo message="J2SE-8.0: ${J2SE-8.0}" />
<echo message="J2SE-7.0: ${J2SE-7.0}" />

Back to the top