54 */ |
54 */ |
55 @BeforeTest |
55 @BeforeTest |
56 public void compileAll() throws Exception { |
56 public void compileAll() throws Exception { |
57 boolean compiled; |
57 boolean compiled; |
58 |
58 |
59 // javac -modulesource mods -d mods src/** |
59 // javac --module-source-path mods -d mods src/** |
60 compiled = CompilerUtils |
60 compiled = CompilerUtils |
61 .compile(SRC_DIR, |
61 .compile(SRC_DIR, |
62 MODS_DIR, |
62 MODS_DIR, |
63 "-modulesourcepath", SRC_DIR.toString()); |
63 "--module-source-path", SRC_DIR.toString()); |
64 assertTrue(compiled); |
64 assertTrue(compiled); |
65 |
65 |
66 // javac -mp mods -d classes Main.java |
66 // javac --module-path mods -d classes Main.java |
67 compiled = CompilerUtils |
67 compiled = CompilerUtils |
68 .compile(Paths.get(TEST_SRC, "Main.java"), |
68 .compile(Paths.get(TEST_SRC, "Main.java"), |
69 CLASSES_DIR, |
69 CLASSES_DIR, |
70 "-mp", MODS_DIR.toString(), |
70 "--module-path", MODS_DIR.toString(), |
71 "-addmods", "m1,m2,m3"); |
71 "--add-modules", "m1,m2,m3"); |
72 assertTrue(compiled); |
72 assertTrue(compiled); |
73 } |
73 } |
74 |
74 |
75 /** |
75 /** |
76 * Run the test |
76 * Run the test |
77 */ |
77 */ |
78 public void runTest() throws Exception { |
78 public void runTest() throws Exception { |
79 int exitValue |
79 int exitValue |
80 = executeTestJava("-mp", MODS_DIR.toString(), |
80 = executeTestJava("--module-path", MODS_DIR.toString(), |
81 "-addmods", "m1,m2,m3", |
81 "--add-modules", "m1,m2,m3", |
82 "-cp", CLASSES_DIR.toString(), |
82 "-cp", CLASSES_DIR.toString(), |
83 "Main") |
83 "Main") |
84 .outputTo(System.out) |
84 .outputTo(System.out) |
85 .errorTo(System.out) |
85 .errorTo(System.out) |
86 .getExitValue(); |
86 .getExitValue(); |