OpenJDK / jdk / jdk
changeset 57434:fdd1c4a2ec5b
8235922: [TESTBUG]TestRecordAttrGenericSig.java and TestRecordAttr.java are failing
Summary: Replace hard-wired JDK version 14 with mechanisms that get the latest JDK version.
Reviewed-by: dcubed
| author | hseigel |
|---|---|
| date | Fri, 13 Dec 2019 19:50:43 +0000 |
| parents | cec148db7b55 |
| children | eefd0a71c160 |
| files | test/jdk/java/lang/instrument/RedefineRecordAttr/TestRecordAttr.java test/jdk/java/lang/instrument/RedefineRecordAttrGenericSig/TestRecordAttrGenericSig.java |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/test/jdk/java/lang/instrument/RedefineRecordAttr/TestRecordAttr.java Fri Dec 13 10:42:57 2019 -0800 +++ b/test/jdk/java/lang/instrument/RedefineRecordAttr/TestRecordAttr.java Fri Dec 13 19:50:43 2019 +0000 @@ -143,6 +143,7 @@ static final String SRC = System.getProperty("test.src"); static final String DEST = System.getProperty("test.classes"); static final boolean VERBOSE = Boolean.getBoolean("verbose"); + private static final String VERSION = Integer.toString(Runtime.version().feature()); public static void main(String[] args) throws Throwable { String origin = args[0]; @@ -271,6 +272,6 @@ dst.toPath(), false /* don't recurse */, "--enable-preview", - "--source", "14"); + "--source", VERSION); } }
--- a/test/jdk/java/lang/instrument/RedefineRecordAttrGenericSig/TestRecordAttrGenericSig.java Fri Dec 13 10:42:57 2019 -0800 +++ b/test/jdk/java/lang/instrument/RedefineRecordAttrGenericSig/TestRecordAttrGenericSig.java Fri Dec 13 19:50:43 2019 +0000 @@ -34,10 +34,10 @@ * jdk.jartool/sun.tools.jar * @compile ../NamedBuffer.java * @run main RedefineClassHelper - * @compile --enable-preview --source 14 Host/Host.java - * @compile --enable-preview --source 14 TestRecordAttrGenericSig.java + * @compile --enable-preview --source ${jdk.version} Host/Host.java + * @compile --enable-preview --source ${jdk.version} TestRecordAttrGenericSig.java * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+record=trace --enable-preview TestRecordAttrGenericSig Host - * @compile --enable-preview --source 14 HostA/Host.java + * @compile --enable-preview --source ${jdk.version} HostA/Host.java * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+record=trace --enable-preview TestRecordAttrGenericSig HostA */ @@ -110,6 +110,7 @@ static final String SRC = System.getProperty("test.src"); static final String DEST = System.getProperty("test.classes"); static final boolean VERBOSE = Boolean.getBoolean("verbose"); + private static final String VERSION = Integer.toString(Runtime.version().feature()); public static void main(String[] args) throws Throwable { String origin = args[0]; @@ -209,6 +210,6 @@ dst.toPath(), false /* don't recurse */, "--enable-preview", - "--source", "14"); + "--source", VERSION); } }