author | jlahoda |
Wed, 18 Sep 2019 10:41:18 +0200 | |
changeset 58203 | dfd434203aa0 |
permissions | -rw-r--r-- |
58203
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
1 |
/* |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
4 |
* |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
8 |
* |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
13 |
* accompanied this code). |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
14 |
* |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
18 |
* |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
21 |
* questions. |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
22 |
*/ |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
23 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
24 |
/** |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
25 |
* @test |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
26 |
* @bug 8228460 |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
27 |
* @summary Verify --system is required rather than -bootclasspath for -source 9. |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
28 |
* @library /tools/lib |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
29 |
* @modules jdk.compiler/com.sun.tools.javac.api |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
30 |
* jdk.compiler/com.sun.tools.javac.main |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
31 |
* @build toolbox.ToolBox toolbox.JavacTask toolbox.TestRunner |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
32 |
* @run main BCPOrSystemNotSpecified |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
33 |
*/ |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
34 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
35 |
import java.io.IOException; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
36 |
import java.nio.file.Path; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
37 |
import java.nio.file.Paths; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
38 |
import java.util.Arrays; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
39 |
import java.util.List; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
40 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
41 |
import java.io.InputStream; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
42 |
import java.nio.file.Files; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
43 |
import java.util.EnumSet; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
44 |
import javax.tools.JavaFileManager; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
45 |
import javax.tools.JavaFileObject; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
46 |
import javax.tools.StandardLocation; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
47 |
import javax.tools.ToolProvider; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
48 |
import toolbox.JavacTask; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
49 |
import toolbox.Task; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
50 |
import toolbox.Task.Expect; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
51 |
import toolbox.TestRunner; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
52 |
import toolbox.ToolBox; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
53 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
54 |
public class BCPOrSystemNotSpecified extends TestRunner { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
55 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
56 |
private final ToolBox tb = new ToolBox(); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
57 |
private final String fileSep = System.getProperty("file.separator"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
58 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
59 |
public BCPOrSystemNotSpecified() { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
60 |
super(System.err); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
61 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
62 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
63 |
public static void main(String... args) throws Exception { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
64 |
new BCPOrSystemNotSpecified().runTests(); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
65 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
66 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
67 |
@Test |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
68 |
public void testSource8(Path base) throws IOException { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
69 |
Path src = base.resolve("src"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
70 |
tb.writeJavaFiles(src, |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
71 |
"package test; public class Test { } "); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
72 |
Path classes = base.resolve("classes"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
73 |
tb.createDirectories(classes); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
74 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
75 |
List<String> log; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
76 |
List<String> expected = Arrays.asList( |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
77 |
"- compiler.warn.source.no.bootclasspath: 8", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
78 |
"1 warning" |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
79 |
); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
80 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
81 |
log = new JavacTask(tb) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
82 |
.options("-XDrawDiagnostics", "-source", "8") |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
83 |
.outdir(classes) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
84 |
.files(tb.findJavaFiles(src)) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
85 |
.run(Expect.SUCCESS) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
86 |
.writeAll() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
87 |
.getOutputLines(Task.OutputKind.DIRECT); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
88 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
89 |
if (!expected.equals(log)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
90 |
throw new AssertionError("Unexpected output: " + log); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
91 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
92 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
93 |
Path bcp = base.resolve("bcp"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
94 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
95 |
prepareBCP(bcp); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
96 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
97 |
new JavacTask(tb) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
98 |
.options("-XDrawDiagnostics", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
99 |
"-source", "8", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
100 |
"-bootclasspath", bcp.toAbsolutePath().toString(), |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
101 |
"-Werror") |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
102 |
.outdir(classes) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
103 |
.files(tb.findJavaFiles(src)) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
104 |
.run(Expect.SUCCESS) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
105 |
.writeAll() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
106 |
.getOutputLines(Task.OutputKind.DIRECT); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
107 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
108 |
if (!expected.equals(log)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
109 |
throw new AssertionError("Unexpected output: " + log); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
110 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
111 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
112 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
113 |
@Test |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
114 |
public void testSource9(Path base) throws IOException { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
115 |
Path src = base.resolve("src"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
116 |
tb.writeJavaFiles(src, |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
117 |
"package test; public class Test { } "); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
118 |
Path classes = base.resolve("classes"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
119 |
tb.createDirectories(classes); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
120 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
121 |
List<String> log; |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
122 |
List<String> expected = Arrays.asList( |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
123 |
"- compiler.warn.source.no.system.modules.path: 9", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
124 |
"1 warning" |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
125 |
); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
126 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
127 |
log = new JavacTask(tb) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
128 |
.options("-XDrawDiagnostics", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
129 |
"-source", "9") |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
130 |
.outdir(classes) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
131 |
.files(tb.findJavaFiles(src)) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
132 |
.run(Expect.SUCCESS) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
133 |
.writeAll() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
134 |
.getOutputLines(Task.OutputKind.DIRECT); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
135 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
136 |
if (!expected.equals(log)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
137 |
throw new AssertionError("Unexpected output: " + log); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
138 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
139 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
140 |
Path bcp = base.resolve("bcp"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
141 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
142 |
prepareBCP(bcp); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
143 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
144 |
log = new JavacTask(tb) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
145 |
.options("-XDrawDiagnostics", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
146 |
"-source", "9", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
147 |
"-bootclasspath", bcp.toAbsolutePath().toString()) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
148 |
.outdir(classes) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
149 |
.files(tb.findJavaFiles(src)) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
150 |
.run(Expect.SUCCESS) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
151 |
.writeAll() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
152 |
.getOutputLines(Task.OutputKind.DIRECT); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
153 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
154 |
if (!expected.equals(log)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
155 |
throw new AssertionError("Unexpected output: " + log); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
156 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
157 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
158 |
new JavacTask(tb) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
159 |
.options("-XDrawDiagnostics", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
160 |
"-source", "9", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
161 |
"--system", "none", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
162 |
"--module-path", bcp.toAbsolutePath().toString(), |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
163 |
"-Werror") |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
164 |
.outdir(classes) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
165 |
.files(tb.findJavaFiles(src)) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
166 |
.run(Expect.SUCCESS) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
167 |
.writeAll() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
168 |
.getOutputLines(Task.OutputKind.DIRECT); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
169 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
170 |
if (!expected.equals(log)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
171 |
throw new AssertionError("Unexpected output: " + log); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
172 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
173 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
174 |
new JavacTask(tb) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
175 |
.options("-XDrawDiagnostics", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
176 |
"-source", "9", |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
177 |
"--system", System.getProperty("java.home"), |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
178 |
"-Werror") |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
179 |
.outdir(classes) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
180 |
.files(tb.findJavaFiles(src)) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
181 |
.run(Expect.SUCCESS) |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
182 |
.writeAll() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
183 |
.getOutputLines(Task.OutputKind.DIRECT); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
184 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
185 |
if (!expected.equals(log)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
186 |
throw new AssertionError("Unexpected output: " + log); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
187 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
188 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
189 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
190 |
protected void runTests() throws Exception { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
191 |
runTests(m -> new Object[] { Paths.get(m.getName()).toAbsolutePath() }); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
192 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
193 |
|
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
194 |
private void prepareBCP(Path target) throws IOException { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
195 |
try (JavaFileManager jfm = ToolProvider.getSystemJavaCompiler() |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
196 |
.getStandardFileManager(null, null, null)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
197 |
for (String pack : new String[] {"", "java.lang", "java.lang.annotation"}) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
198 |
JavaFileManager.Location javaBase = |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
199 |
jfm.getLocationForModule(StandardLocation.SYSTEM_MODULES, |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
200 |
"java.base"); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
201 |
for (JavaFileObject file : jfm.list(javaBase, |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
202 |
pack, |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
203 |
EnumSet.of(JavaFileObject.Kind.CLASS), |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
204 |
false)) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
205 |
Path targetDir = target.resolve(pack.replace(".", fileSep)); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
206 |
Files.createDirectories(targetDir); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
207 |
try (InputStream in = file.openInputStream()) { |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
208 |
String sourcePath = file.getName(); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
209 |
int sepPos = sourcePath.lastIndexOf(fileSep); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
210 |
String fileName = sourcePath.substring(sepPos + 1); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
211 |
Files.copy(in, targetDir.resolve(fileName)); |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
212 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
213 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
214 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
215 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
216 |
} |
dfd434203aa0
8228460: bootstrap class path not set in conjunction with -source 11
jlahoda
parents:
diff
changeset
|
217 |
} |