# HG changeset patch
# User chegar
# Date 1484732123 0
# Node ID 45757c4367f24b97fc144a7adda294fed5576062
# Parent  df68602dc42263979acaec77923bba082c406091
8171380: Remove all exports from jdk.jlink
Reviewed-by: alanb, mchung, sundar

diff -r df68602dc422 -r 45757c4367f2 langtools/test/TEST.ROOT
--- a/langtools/test/TEST.ROOT	Tue Jan 17 09:40:23 2017 -0800
+++ b/langtools/test/TEST.ROOT	Wed Jan 18 09:35:23 2017 +0000
@@ -14,8 +14,8 @@
 # Group definitions
 groups=TEST.groups
 
-# Tests using jtreg 4.2 b04 features
-requiredVersion=4.2 b04
+# Tests using jtreg 4.2 b05 features
+requiredVersion=4.2 b05
 
 # Use new module options
 useNewOptions=true
diff -r df68602dc422 -r 45757c4367f2 langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java
--- a/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java	Tue Jan 17 09:40:23 2017 -0800
+++ b/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java	Wed Jan 18 09:35:23 2017 +0000
@@ -143,6 +143,7 @@
                     Arrays.asList(new File(System.getProperty("test.src"),
                     this.getClass().getName() + ".java")));
             java.util.List<String> options = Arrays.asList(
+                "--add-modules", "jdk.jdeps",
                 "--add-exports", "jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED",
                 "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
                 "--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
diff -r df68602dc422 -r 45757c4367f2 langtools/test/tools/javac/diags/Example.java
--- a/langtools/test/tools/javac/diags/Example.java	Tue Jan 17 09:40:23 2017 -0800
+++ b/langtools/test/tools/javac/diags/Example.java	Wed Jan 18 09:35:23 2017 +0000
@@ -236,6 +236,7 @@
             // source for import statements or a magic comment
             for (File pf: procFiles) {
                 if (pf.getName().equals("CreateBadClassFile.java")) {
+                    pOpts.add("--add-modules=jdk.jdeps");
                     pOpts.add("--add-exports=jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED");
                 }
             }
diff -r df68602dc422 -r 45757c4367f2 langtools/test/tools/javap/T7004698.java
--- a/langtools/test/tools/javap/T7004698.java	Tue Jan 17 09:40:23 2017 -0800
+++ b/langtools/test/tools/javap/T7004698.java	Wed Jan 18 09:35:23 2017 +0000
@@ -42,6 +42,7 @@
         File srcFile = new File(srcDir, T7004698.class.getSimpleName() + ".java");
         File classesDir = new File(".");
         compile("-Xjcov",
+                "--add-modules", "jdk.jdeps",
                 "--add-exports", "jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED",
                 "-d", classesDir.getPath(),
                 srcFile.getPath());
diff -r df68602dc422 -r 45757c4367f2 langtools/test/tools/jdeps/APIDeps.java
--- a/langtools/test/tools/jdeps/APIDeps.java	Tue Jan 17 09:40:23 2017 -0800
+++ b/langtools/test/tools/jdeps/APIDeps.java	Wed Jan 18 09:35:23 2017 +0000
@@ -60,6 +60,9 @@
         Path testsrc = Paths.get(System.getProperty("test.src"));
         List<String> options = new ArrayList<>();
 
+        // jdk.jdeps is a service provider module so needs to be explicitly included
+        options.add("--add-modules=jdk.jdeps");
+
         // add --add-exports
         String testModules = System.getProperty("test.modules", "");
         List<String> addExports = new ArrayList<>();