mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 02:54:35 +02:00
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282 Co-authored-by: Alex Buckley <alex.buckley@oracle.com> Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com> Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Co-authored-by: Vicente Romero <vicente.romero@oracle.com> Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com> Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com> Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com> Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com> Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com> Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com> Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
This commit is contained in:
parent
8cffe4fb02
commit
001ebb3a72
879 changed files with 26184 additions and 9697 deletions
|
@ -31,6 +31,7 @@
|
|||
* jdk.compiler/com.sun.tools.javac.file
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* jdk.compiler/com.sun.tools.javac.util
|
||||
* jdk.jdeps/com.sun.tools.javap
|
||||
* @build ToolBox
|
||||
* @run main PathsTest
|
||||
*/
|
||||
|
@ -70,7 +71,6 @@ public class PathsTest {
|
|||
test("src/Test.java", "-classpath", "classes1" + PS + "classes2");
|
||||
|
||||
File testJar = createJar();
|
||||
String sysBootClassPath = System.getProperty("sun.boot.class.path");
|
||||
test("src/Test.java", "-bootclasspath",
|
||||
testJar + PS + "classes1" + PS + "classes2");
|
||||
|
||||
|
@ -87,7 +87,12 @@ public class PathsTest {
|
|||
if (!pkgNotFound.matcher(out1).find())
|
||||
error("message not found: " + pkgNotFound);
|
||||
|
||||
String out2 = doclint("-Xmsgs", pathOpt, path, file);
|
||||
String out2;
|
||||
if (needTarget8(pathOpt)) {
|
||||
out2 = doclint("-Xmsgs", "-source", "8", "-target", "8", pathOpt, path, file);
|
||||
} else {
|
||||
out2 = doclint("-Xmsgs", pathOpt, path, file);
|
||||
}
|
||||
if (pkgNotFound.matcher(out2).find())
|
||||
error("unexpected message found: " + pkgNotFound);
|
||||
if (!badHtmlEntity.matcher(out1).find())
|
||||
|
@ -101,6 +106,15 @@ public class PathsTest {
|
|||
}
|
||||
}
|
||||
|
||||
boolean needTarget8(String opt) {
|
||||
switch (opt) {
|
||||
case "-bootclasspath":
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
File createJar() throws IOException {
|
||||
File f = new File("test.jar");
|
||||
try (JavaFileManager fm = new JavacFileManager(new Context(), false, null)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue