infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-31 13:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

8154500: fix handling of jdk.launcher.patch.* in tests

Browse Source 
Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2016-04-18 19:14:50 -07:00
parent 8f62cdc8a0
commit 28ed819ae9
4 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
langtools/test/jdk/javadoc/tool/6964914/TestStdDoclet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2016, 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
@ -28,6 +28,7 @@
*/
import java.io.*;
import java.util.*;
/**
* Dummy javadoc comment.
@ -54,13 +55,21 @@ public class TestStdDoclet {
// run javadoc in separate process to ensure doclet executed under
// normal user conditions w.r.t. classloader
String thisClassName = TestStdDoclet.class.getName();
Process p = new ProcessBuilder()
.command(javadoc.getPath(),
"-J-Xpatch:" + System.getProperty("jdk.launcher.patch.0", ""),
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
int i = 0;
String prop;
while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
cmdArgs.add("-J-Xpatch:" + prop);
}
cmdArgs.addAll(Arrays.asList(
"-classpath", ".", // insulates us from ambient classpath
"-Xdoclint:none",
"-package",
new File(testSrc, thisClassName + ".java").getPath())
new File(testSrc, thisClassName + ".java").getPath()
));
Process p = new ProcessBuilder()
.command(cmdArgs)
.redirectErrorStream(true)
.start();

19
langtools/test/jdk/javadoc/tool/6964914/TestUserDoclet.java
View File

@ -30,7 +30,10 @@
import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Set;
@ -63,12 +66,20 @@ public class TestUserDoclet implements Doclet {
// run javadoc in separate process to ensure doclet executed under
// normal user conditions w.r.t. classloader
String thisClassName = TestUserDoclet.class.getName();
Process p = new ProcessBuilder()
.command(javadoc.getPath(),
"-J-Xpatch:" + System.getProperty("jdk.launcher.patch.0", ""),
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
int i = 0;
String prop;
while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
cmdArgs.add("-J-Xpatch:" + prop);
}
cmdArgs.addAll(Arrays.asList(
"-doclet", thisClassName,
"-docletpath", testClasses.getPath(),
new File(testSrc, thisClassName + ".java").getPath())
new File(testSrc, thisClassName + ".java").getPath()
));
Process p = new ProcessBuilder()
.command(cmdArgs)
.redirectErrorStream(true)
.start();

19
langtools/test/tools/javadoc/6964914/TestStdDoclet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2016, 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
@ -28,6 +28,7 @@
*/
import java.io.*;
import java.util.*;
/**
* Dummy javadoc comment.
@ -54,13 +55,21 @@ public class TestStdDoclet {
// run javadoc in separate process to ensure doclet executed under
// normal user conditions w.r.t. classloader
String thisClassName = TestStdDoclet.class.getName();
Process p = new ProcessBuilder()
.command(javadoc.getPath(),
"-J-Xpatch:" + System.getProperty("jdk.launcher.patch.0", ""),
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
int i = 0;
String prop;
while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
cmdArgs.add("-J-Xpatch:" + prop);
}
cmdArgs.addAll(Arrays.asList(
"-classpath", ".", // insulates us from ambient classpath
"-Xdoclint:none",
"-package",
new File(testSrc, thisClassName + ".java").getPath())
new File(testSrc, thisClassName + ".java").getPath()
));
Process p = new ProcessBuilder()
.command(cmdArgs)
.redirectErrorStream(true)
.start();

20
langtools/test/tools/javadoc/6964914/TestUserDoclet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2016, 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
@ -29,6 +29,8 @@
*/
import java.io.*;
import java.util.*;
import com.sun.javadoc.Doclet;
import com.sun.javadoc.RootDoc;
@ -55,12 +57,20 @@ public class TestUserDoclet extends Doclet {
// run javadoc in separate process to ensure doclet executed under
// normal user conditions w.r.t. classloader
String thisClassName = TestUserDoclet.class.getName();
Process p = new ProcessBuilder()
.command(javadoc.getPath(),
"-J-Xpatch:" + System.getProperty("jdk.launcher.patch.0", ""),
List<String> cmdArgs = new ArrayList<>();
cmdArgs.add(javadoc.getPath());
int i = 0;
String prop;
while ((prop = System.getProperty("jdk.launcher.patch." + (i++))) != null) {
cmdArgs.add("-J-Xpatch:" + prop);
}
cmdArgs.addAll(Arrays.asList(
"-doclet", thisClassName,
"-docletpath", testClasses.getPath(),
new File(testSrc, thisClassName + ".java").getPath())
new File(testSrc, thisClassName + ".java").getPath()
));
Process p = new ProcessBuilder()
.command(cmdArgs)
.redirectErrorStream(true)
.start();