test/tools/javac/modules/MOptionTest.java

@@ -47,25 +47,25 @@
     }
 
     @Test
     public void testOneModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package test; public class Test {}");
 
         new JavacTask(tb)
-                .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
-        Path moduleInfoClass = build.resolve("m1/module-info.class");
-        Path testTestClass = build.resolve("m1/test/Test.class");
+        Path moduleInfoClass = build.resolve("m1x/module-info.class");
+        Path testTestClass = build.resolve("m1x/test/Test.class");
 
         FileTime moduleInfoTimeStamp = Files.getLastModifiedTime(moduleInfoClass);
         FileTime testTestTimeStamp = Files.getLastModifiedTime(testTestClass);
 
         Path moduleInfo = m1.resolve("module-info.java");

@@ -79,11 +79,11 @@
         }
 
         Thread.sleep(2000); //timestamps
 
         new JavacTask(tb)
-                .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
         if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
             throw new AssertionError("Classfile update!");

@@ -96,11 +96,11 @@
         Thread.sleep(2000); //timestamps
 
         Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis()));
 
         new JavacTask(tb)
-                .options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
         if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
             throw new AssertionError("Classfile update!");

@@ -112,21 +112,21 @@
     }
 
     @Test
     public void testNoOutputDir(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package test; public class Test {}");
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                    "-m", "m1",
+                    "-m", "m1x",
                     "--module-source-path", src.toString())
                 .run(Task.Expect.FAIL)
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 

@@ -135,21 +135,21 @@
     }
 
     @Test
     public void testNoModuleSourcePath(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
+        Path m1 = src.resolve("m1x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package test; public class Test {}");
 
         String log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                        "-m", "m1",
+                        "-m", "m1x",
                         "-d", build.toString())
                 .run(Task.Expect.FAIL)
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 

@@ -158,33 +158,33 @@
     }
 
     @Test
     public void testMultiModule(Path base) throws Exception {
         Path src = base.resolve("src");
-        Path m1 = src.resolve("m1");
-        Path m2 = src.resolve("m2");
+        Path m1 = src.resolve("m1x");
+        Path m2 = src.resolve("m2x");
         Path build = base.resolve("build");
         Files.createDirectories(build);
 
         tb.writeJavaFiles(m1,
-                "module m1 {}",
+                "module m1x {}",
                 "package p1; public class C1 {}");
 
         tb.writeJavaFiles(m2,
-                "module m2 {}",
+                "module m2x {}",
                 "package p2; public class C2 {}");
 
         new JavacTask(tb)
-                .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
-        Path m1ModuleInfoClass = build.resolve("m1/module-info.class");
-        Path classC1 = build.resolve("m1/p1/C1.class");
+        Path m1ModuleInfoClass = build.resolve("m1x/module-info.class");
+        Path classC1 = build.resolve("m1x/p1/C1.class");
 
-        Path m2ModuleInfoClass = build.resolve("m2/module-info.class");
-        Path classC2 = build.resolve("m2/p2/C2.class");
+        Path m2ModuleInfoClass = build.resolve("m2x/module-info.class");
+        Path classC2 = build.resolve("m2x/p2/C2.class");
 
         FileTime m1ModuleInfoTimeStamp = Files.getLastModifiedTime(m1ModuleInfoClass);
         FileTime C1TimeStamp = Files.getLastModifiedTime(classC1);
 
         FileTime m2ModuleInfoTimeStamp = Files.getLastModifiedTime(m2ModuleInfoClass);

@@ -213,11 +213,11 @@
         }
 
         Thread.sleep(2000); //timestamps
 
         new JavacTask(tb)
-                .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
         if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
             throw new AssertionError("Classfile update!");

@@ -239,11 +239,11 @@
 
         Files.setLastModifiedTime(C1Source, FileTime.fromMillis(System.currentTimeMillis()));
         Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis()));
 
         new JavacTask(tb)
-                .options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString())
+                .options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
                 .run(Task.Expect.SUCCESS)
                 .writeAll();
 
         if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
             throw new AssertionError("Classfile update!");