Mercurial > hg > openjdk > jdk8u > langtools
changeset 3928:3e1dd745bcb1
Merge
| author | andrew |
|---|---|
| date | Thu, 22 Apr 2021 01:33:31 +0100 |
| parents | 2dfc2246f52d (current diff) a4662967ff21 (diff) |
| children | b55815589fee |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile Wed Mar 17 20:42:12 2021 +0000 +++ b/test/Makefile Thu Apr 22 01:33:31 2021 +0100 @@ -139,21 +139,19 @@ # Default JDK for JTREG and JCK # -# JT_JAVA is the version of java used to run jtreg/JCK. Since it is now -# standard to execute tests in sameVM mode, it should normally be set the -# same as TESTJAVA (although not necessarily so.) +# JT_JAVA is the version of java used to run jtreg/JCK. # ifdef JPRT_JAVA_HOME JT_JAVA = $(JPRT_JAVA_HOME) else - JT_JAVA = $(SLASH_JAVA)/re/jdk/1.7.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH) + JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH) endif # Default JDK to test ifdef JPRT_IMPORT_PRODUCT_HOME TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME) else - TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH) + TESTJAVA = $(SLASH_JAVA)/re/jdk/1.9.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH) endif # PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from @@ -186,7 +184,7 @@ ifdef CONCURRENCY JTREG_OPTIONS += -agentvm -concurrency:$(CONCURRENCY) else - JTREG_OPTIONS += -samevm + JTREG_OPTIONS += -agentvm endif ifdef JCK_CONCURRENCY
--- a/test/tools/javac/diags/examples/NoJavaLang.java Wed Mar 17 20:42:12 2021 +0000 +++ b/test/tools/javac/diags/examples/NoJavaLang.java Thu Apr 22 01:33:31 2021 +0100 @@ -22,7 +22,7 @@ */ // key: compiler.misc.fatal.err.no.java.lang -// options: -Xbootclasspath: +// options: -Xbootclasspath: -classpath . // run: backdoor class NoJavaLang { }
--- a/test/tools/javac/fatalErrors/NoJavaLangTest.java Wed Mar 17 20:42:12 2021 +0000 +++ b/test/tools/javac/fatalErrors/NoJavaLangTest.java Thu Apr 22 01:33:31 2021 +0100 @@ -58,7 +58,7 @@ List<String> output = new ArrayList<>(); ToolBox.JavaToolArgs javacFailArgs = new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) - .setOptions("-bootclasspath", ".") + .setOptions("-bootclasspath", ".", "-classpath", ".") .setSources(noJavaLangSrc) .setErrOutput(output);