infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-07 22:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8314975: JavadocTester should set source path if not specified

Browse Source 
Reviewed-by: hannesw
This commit is contained in:
Jonathan Gibbons 2023-10-17 21:00:29 +00:00
parent 0ba48ef4ab
commit 2f4d601a56
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/langtools/jdk/javadoc/lib/javadoc/tester/JavadocTester.java
View File

@ -424,12 +424,14 @@ public abstract class JavadocTester {
String charsetArg = null;
String docencodingArg = null;
String encodingArg = null;
boolean haveSourcePath = false;
for (int i = 0; i < args.length - 2; i++) {
switch (args[i]) {
case "-d" -> outputDir = Path.of(args[++i]);
case "-charset" -> charsetArg = args[++i];
case "-docencoding" -> docencodingArg = args[++i];
case "-encoding" -> encodingArg = args[++i];
case "-sourcepath", "--source-path", "--module-source-path" -> haveSourcePath = true;
}
}
@ -451,6 +453,16 @@ public abstract class JavadocTester {
charset = Charset.defaultCharset();
}
// explicitly set the source path if none specified
// to override the javadoc tool default to use the classpath
if (!haveSourcePath) {
var newArgs = new String[args.length + 2];
newArgs[0] = "-sourcepath";
newArgs[1] = testSrc;
System.arraycopy(args, 0, newArgs, 2, args.length);
args = newArgs;
}
out.println("args: " + Arrays.toString(args));
// log.setOutDir(outputDir);