Please review this trivial change to reconcile a bad merge.

One changeset added a new test which depends on the JavadocTester library; a different changeset moved the library.  The test needs to be updated for the new location of the library in its new package. There is no other change in functionality.

Change is inline, below.
JBS: https://bugs.openjdk.java.net/browse/JDK-8217214

-- Jon


$ hg diff
diff -r 142b179dd60e test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java --- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java Tue Jan 15 19:24:07 2019 -0300 +++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java Tue Jan 15 14:56:25 2019 -0800
@@ -25,12 +25,12 @@
  * @test
  * @bug 8212233
  * @summary The code being documented uses modules but the packages defined in $URL are in the unnamed module.
- * @library /tools/lib ../lib
+ * @library /tools/lib ../../lib
  * @modules
  *      jdk.javadoc/jdk.javadoc.internal.tool
  *      jdk.compiler/com.sun.tools.javac.api
  *      jdk.compiler/com.sun.tools.javac.main
- * @build JavadocTester toolbox.JarTask toolbox.JavacTask toolbox.ModuleBuilder toolbox.ToolBox + * @build javadoc.tester.* toolbox.JarTask toolbox.JavacTask toolbox.ModuleBuilder toolbox.ToolBox
  * @run main TestLinkOptionWithAutomaticModule
  */

@@ -43,6 +43,8 @@
 import toolbox.ModuleBuilder;
 import toolbox.ToolBox;

+import javadoc.tester.JavadocTester;
+
 public class TestLinkOptionWithAutomaticModule extends JavadocTester {

     public static void main(String... args) throws Exception {

Reply via email to