8255009: delta apply fixes for JDK-8246774 and JDK-8253455, pushed too soon

Reviewed-by: jlahoda
This commit is contained in:
Vicente Romero 2020-10-19 15:55:54 +00:00
parent a0382cd17c
commit 1da28de82f
121 changed files with 923 additions and 312 deletions

View file

@ -23,7 +23,7 @@
/*
* @test
* @bug 8192920 8204588 8246774
* @bug 8192920 8204588
* @summary Test source launcher
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
@ -299,7 +299,7 @@ public class SourceLauncherTest extends TestRunner {
file + ":1: error: illegal character: '#'\n" +
"#!/usr/bin/java --source " + thisVersion + "\n" +
"^\n" +
file + ":1: error: class, interface, enum, or record expected\n" +
file + ":1: error: class, interface, or enum expected\n" +
"#!/usr/bin/java --source " + thisVersion + "\n" +
" ^\n" +
"2 errors\n",
@ -505,7 +505,7 @@ public class SourceLauncherTest extends TestRunner {
file + ":1: error: illegal character: '#'\n" +
"#/usr/bin/java --source " + thisVersion + "\n" +
"^\n" +
file + ":1: error: class, interface, enum, or record expected\n" +
file + ":1: error: class, interface, or enum expected\n" +
"#/usr/bin/java --source " + thisVersion + "\n" +
" ^\n" +
"2 errors\n",