infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-18 06:15:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

8174104: Compiler does not allow non-existent module path entry

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Jonathan Gibbons 2017-02-10 15:42:17 -08:00
parent 6d8a15972e
commit 0fcd98980c
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
View File

@ -985,6 +985,11 @@ public class Locations {
}
private void checkValidModulePathEntry(Path p) {
if (!Files.exists(p)) {
// warning may be generated later
return;
}
if (Files.isDirectory(p)) {
// either an exploded module or a directory of modules
return;

4
langtools/test/tools/javac/diags/examples/IllegalArgumentForOption/IllegalArgumentForOption.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -22,7 +22,7 @@
*/
// key: compiler.err.illegal.argument.for.option
// options: --module-path doesNotExist
// options: --module-source-path=abc*def
// run: simple
class X {}

27
langtools/test/tools/javac/modules/ModulePathTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,6 +23,7 @@
/*
* @test
* @bug 8142968 8174104
* @summary tests for --module-path
* @library /tools/lib
* @modules
@ -57,7 +58,7 @@ public class ModulePathTest extends ModuleTestBase {
}
@Test
public void testNotExistsOnPath(Path base) throws Exception {
public void testNotExistsOnPath_noWarn(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src, "class C { }");
@ -65,11 +66,29 @@ public class ModulePathTest extends ModuleTestBase {
.options("-XDrawDiagnostics",
"--module-path", "doesNotExist")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.run(Task.Expect.SUCCESS)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, doesNotExist"))
if (!log.isEmpty())
throw new Exception("unexpected output");
}
@Test
public void testNotExistsOnPath_warn(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src, "class C { }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
"-Xlint:path",
"--module-path", "doesNotExist")
.files(findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!log.contains("- compiler.warn.path.element.not.found: doesNotExist"))
throw new Exception("expected output not found");
}