71 CompilerUtils.cleanDir(LIBS_DIR); |
71 CompilerUtils.cleanDir(LIBS_DIR); |
72 CompilerUtils.cleanDir(DEST_DIR); |
72 CompilerUtils.cleanDir(DEST_DIR); |
73 CompilerUtils.cleanDir(NEW_MODS_DIR); |
73 CompilerUtils.cleanDir(NEW_MODS_DIR); |
74 |
74 |
75 assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED, |
75 assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED, |
76 "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED)); |
76 "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); |
77 Arrays.asList("m1", "m2", "m3") |
77 Arrays.asList("m1", "m2", "m3") |
78 .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn))); |
78 .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn))); |
79 |
79 |
80 Files.createDirectory(LIBS_DIR); |
80 Files.createDirectory(LIBS_DIR); |
81 Files.createDirectory(DEST_DIR); |
81 Files.createDirectory(DEST_DIR); |
104 public void test() throws IOException { |
104 public void test() throws IOException { |
105 Stream<String> files = Arrays.stream(modules) |
105 Stream<String> files = Arrays.stream(modules) |
106 .map(mn -> LIBS_DIR.resolve(mn + ".jar")) |
106 .map(mn -> LIBS_DIR.resolve(mn + ".jar")) |
107 .map(Path::toString); |
107 .map(Path::toString); |
108 |
108 |
109 JdepsUtil.jdeps(Stream.concat(Stream.of("-genmoduleinfo", DEST_DIR.toString()), |
109 JdepsUtil.jdeps(Stream.concat(Stream.of("--gen-module-info", DEST_DIR.toString()), |
110 files).toArray(String[]::new)); |
110 files).toArray(String[]::new)); |
111 |
111 |
112 // check file exists |
112 // check file exists |
113 Arrays.stream(modules) |
113 Arrays.stream(modules) |
114 .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java")) |
114 .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java")) |
130 }); |
130 }); |
131 } |
131 } |
132 |
132 |
133 // compile new module-info.java |
133 // compile new module-info.java |
134 assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, UNSUPPORTED, |
134 assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, UNSUPPORTED, |
135 "-mp", NEW_MODS_DIR.toString(), "-verbose", |
135 "-p", NEW_MODS_DIR.toString(), "-verbose", |
136 "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED)); |
136 "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); |
137 Arrays.asList("m1", "m2", "m3") |
137 Arrays.asList("m1", "m2", "m3") |
138 .forEach(mn -> assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, |
138 .forEach(mn -> assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, |
139 mn, "-mp", NEW_MODS_DIR.toString()))); |
139 mn, "-p", NEW_MODS_DIR.toString()))); |
140 |
140 |
141 for (String mn : modules) { |
141 for (String mn : modules) { |
142 Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO); |
142 Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO); |
143 Path p2 = MODS_DIR.resolve(mn).resolve(MODULE_INFO); |
143 Path p2 = MODS_DIR.resolve(mn).resolve(MODULE_INFO); |
144 |
144 |