diff options
| author | Jay Arthanareeswaran | 2018-02-06 10:16:30 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2018-02-07 05:39:50 +0000 |
| commit | b7e82f8289de2e7ef0cb9d446ec9ac5bddbc31ca (patch) | |
| tree | 9180509aab7bcd8e5a48118eaebd3ebe9bf355da /production/testScripts | |
| parent | f3c755bdfa7f002a8833eb0fb61afc7884163be4 (diff) | |
| download | eclipse.platform.releng.aggregator-b7e82f8289de2e7ef0cb9d446ec9ac5bddbc31ca.tar.gz eclipse.platform.releng.aggregator-b7e82f8289de2e7ef0cb9d446ec9ac5bddbc31ca.tar.xz eclipse.platform.releng.aggregator-b7e82f8289de2e7ef0cb9d446ec9ac5bddbc31ca.zip | |
Bug 530248 - DNF in JDT core tests with Java 9
Change-Id: I4cf3b1bdb032fd497973ff49b2b86f9fa4ca1903
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>
Diffstat (limited to 'production/testScripts')
| -rw-r--r-- | production/testScripts/configuration/sdk.tests/testScripts/test.xml | 107 |
1 files changed, 84 insertions, 23 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index c4f77f9c9..272850f9f 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -1065,34 +1065,64 @@ <condition property="J2SE-5.0" value="${java.home}/bin/java"> - <matches - string="${java.version}" - pattern="^1\.[5678].*$" /> + <or> + <matches + string="${java.version}" + pattern="^1\.[5678].*$" /> + <matches + string="${java.version}" + pattern="^[9].*$" /> + </or> </condition> <condition property="J2SE-6.0" value="${java.home}/bin/java"> - <matches - string="${java.version}" - pattern="^1\.[678].*$" /> + <or> + <matches + string="${java.version}" + pattern="^1\.[678].*$" /> + <matches + string="${java.version}" + pattern="^[9].*$" /> + </or> </condition> <condition property="J2SE-7.0" value="${java.home}/bin/java"> - <matches - string="${java.version}" - pattern="^1\.[78].*$" /> + <or> + <matches + string="${java.version}" + pattern="^1\.[78].*$" /> + <matches + string="${java.version}" + pattern="^[9].*$" /> + </or> </condition> <condition property="J2SE-8.0" value="${java.home}/bin/java"> - <matches - string="${java.version}" - pattern="^1\.[8].*$" /> + <or> + <matches + string="${java.version}" + pattern="^1\.[8].*$" /> + <matches + string="${java.version}" + pattern="^[9].*$" /> + </or> </condition> + <condition + property="J2SE-9.0" + value="${java.home}/bin/java"> + <matches + string="${java.version}" + pattern="^[9].*$" /> + </condition> <echo level="info" message="DEBUG: values from setJVMProperties" /> + <echo + level="info" + message="J2SE-9.0: ${J2SE-9.0}" /> <echo level="info" message="J2SE-8.0: ${J2SE-8.0}" /> @@ -1128,36 +1158,64 @@ <echo message="${javaversion}" /> <condition - property="J2SE-8.0" + property="J2SE-9.0" value="${jvm}"> <matches string="${javaversion}" - pattern='^java version "1\.[8].*"' /> + pattern='^java version "[9].*"' /> + </condition> + <condition + property="J2SE-8.0" + value="${jvm}"> + <or> + <matches + string="${javaversion}" + pattern='^java version "1\.[8].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[9].*"' /> + </or> </condition> <condition property="J2SE-7.0" value="${jvm}"> - <matches - string="${javaversion}" - pattern='^java version "1\.[78].*"' /> + <or> + <matches + string="${javaversion}" + pattern='^java version "1\.[78].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[9].*"' /> + </or> </condition> <condition property="J2SE-6.0" value="${jvm}"> - <matches - string="${javaversion}" - pattern='^java version "1\.[678].*"' /> + <or> + <matches + string="${javaversion}" + pattern='^java version "1\.[678].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[9].*"' /> + </or> </condition> <condition property="J2SE-5.0" value="${jvm}"> - <matches - string="${javaversion}" - pattern='^java version "1\.[5678].*"' /> + <or> + <matches + string="${javaversion}" + pattern='^java version "1\.[5678].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[9].*"' /> + </or> </condition> <echo level="info" message="DEBUG: values from setJVMfromUserSpecified" /> + <echo message="J2SE-9.0: ${J2SE-9.0}" /> <echo message="J2SE-8.0: ${J2SE-8.0}" /> <echo message="J2SE-7.0: ${J2SE-7.0}" /> <echo message="J2SE-6.0: ${J2SE-6.0}" /> @@ -1608,6 +1666,7 @@ <isset property="J2SE-6.0" /> <isset property="J2SE-7.0" /> <isset property="J2SE-8.0" /> + <isset property="J2SE-9.0" /> </or> </not> </condition> @@ -1640,6 +1699,7 @@ <isset property="J2SE-6.0" /> <isset property="J2SE-7.0" /> <isset property="J2SE-8.0" /> + <isset property="J2SE-9.0" /> </or> </not> </condition> @@ -1659,6 +1719,7 @@ <isset property="J2SE-6.0" /> <isset property="J2SE-7.0" /> <isset property="J2SE-8.0" /> + <isset property="J2SE-9.0" /> </or> </not> </condition> |