diff options
Diffstat (limited to 'production/testScripts/configuration/sdk.tests/testScripts/test.xml')
| -rw-r--r-- | production/testScripts/configuration/sdk.tests/testScripts/test.xml | 146 |
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}" /> |