diff options
Bug 536942 - Running Y build with Java 11 compiler for test results
Change-Id: Ib5aaaf9ca8e63e4ee74a57193cd81a1bac08f70d
Signed-off-by: jay <jarthana@in.ibm.com>
Diffstat (limited to 'production/testScripts/configuration/sdk.tests/testScripts')
| -rw-r--r-- | production/testScripts/configuration/sdk.tests/testScripts/test.xml | 66 |
1 files changed, 63 insertions, 3 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index 2722b58e2..8242d7520 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -1075,6 +1075,9 @@ <matches string="${java.version}" pattern="^[10].*$" /> + <matches + string="${java.version}" + pattern="^[11].*$" /> </or> </condition> <condition @@ -1090,6 +1093,9 @@ <matches string="${java.version}" pattern="^[10].*$" /> + <matches + string="${java.version}" + pattern="^[11].*$" /> </or> </condition> <condition @@ -1105,6 +1111,9 @@ <matches string="${java.version}" pattern="^[10].*$" /> + <matches + string="${java.version}" + pattern="^[11].*$" /> </or> </condition> <condition @@ -1120,28 +1129,51 @@ <matches string="${java.version}" pattern="^[10].*$" /> + <matches + string="${java.version}" + pattern="^[11].*$" /> </or> </condition> <condition property="J2SE-9.0" value="${java.home}/bin/java"> + <or> <matches string="${java.version}" pattern="^[9].*$" /> <matches string="${java.version}" pattern="^[10].*$" /> + <matches + string="${java.version}" + pattern="^[11].*$" /> + </or> </condition> <condition property="J2SE-10.0" value="${java.home}/bin/java"> + <or> + <matches + string="${java.version}" + pattern="^[10].*$" /> + <matches + string="${java.version}" + pattern="^[11].*$" /> + </or> + </condition> + <condition + property="J2SE-11.0" + value="${java.home}/bin/java"> <matches string="${java.version}" - pattern="^[10].*$" /> + pattern="^[11].*$" /> </condition> <echo level="info" message="DEBUG: values from setJVMProperties" /> + <echo + level="info" + message="J2SE-11.0: ${J2SE-11.0}" /> <echo level="info" message="J2SE-10.0: ${J2SE-10.0}" /> @@ -1183,11 +1215,23 @@ <echo message="${javaversion}" /> <condition - property="J2SE-10.0" + property="J2SE-11.0" value="${jvm}"> <matches string="${javaversion}" - pattern='^java version "[10].*"' /> + pattern='^java version "[11].*"' /> + </condition> + <condition + property="J2SE-10.0" + value="${jvm}"> + <or> + <matches + string="${javaversion}" + pattern='^java version "[10].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[11].*"' /> + </or> </condition> <condition property="J2SE-9.0" @@ -1199,6 +1243,9 @@ <matches string="${javaversion}" pattern='^java version "[10].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[11].*"' /> </or> </condition> <condition @@ -1214,6 +1261,9 @@ <matches string="${javaversion}" pattern='^java version "[10].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[11].*"' /> </or> </condition> <condition @@ -1229,6 +1279,9 @@ <matches string="${javaversion}" pattern='^java version "[10].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[11].*"' /> </or> </condition> <condition @@ -1244,6 +1297,9 @@ <matches string="${javaversion}" pattern='^java version "[10].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[11].*"' /> </or> </condition> <condition @@ -1259,11 +1315,15 @@ <matches string="${javaversion}" pattern='^java version "[10].*"' /> + <matches + string="${javaversion}" + pattern='^java version "[11].*"' /> </or> </condition> <echo level="info" message="DEBUG: values from setJVMfromUserSpecified" /> + <echo message="J2SE-11.0: ${J2SE-11.0}" /> <echo message="J2SE-10.0: ${J2SE-10.0}" /> <echo message="J2SE-9.0: ${J2SE-9.0}" /> <echo message="J2SE-8.0: ${J2SE-8.0}" /> |