jdk/test/tools/jmod/JmodNegativeTest.java

@@ -312,11 +312,11 @@
         String cp = EXPLODED_DIR.resolve("foo").resolve("classes").toString();
 
         jmod("create",
              "--class-path", cp,
              "--hash-modules", ".*",
-             "--modulepath", emptyDir.toString(),
+             "--module-path", emptyDir.toString(),
             jmod.toString())
             .resultChecker(r ->
                 assertContains(r.output, "No hashes recorded: " +
                     "no module specified for hashing depends on foo")
             );

@@ -333,11 +333,11 @@
             String cp = EXPLODED_DIR.resolve("foo").resolve("classes").toString();
 
             jmod("create",
                  "--class-path", cp,
                  "--hash-modules", ".*",
-                 "--modulepath", MODS_DIR.toString(),
+                 "--module-path", MODS_DIR.toString(),
                  jmod.toString())
                 .assertFailure();
         } finally {
             FileUtils.deleteFileWithRetry(empty);
         }

@@ -351,11 +351,11 @@
         FileUtils.deleteFileIfExistsWithRetry(file);
         Files.createFile(file);
 
         jmod("create",
              "--hash-modules", ".*",
-             "--modulepath", file.toString(),
+             "--module-path", file.toString(),
              jmod.toString())
             .assertFailure()
             .resultChecker(r ->
                 assertContains(r.output, "Error: path must be a directory")
             );

@@ -368,11 +368,11 @@
         FileUtils.deleteFileIfExistsWithRetry(Paths.get("doesNotExist"));
 
         List<Supplier<JmodResult>> tasks = Arrays.asList(
                 () -> jmod("create",
                            "--hash-modules", "anyPattern",
-                           "--modulepath", "doesNotExist",
+                           "--module-path", "doesNotExist",
                            "output.jmod"),
                 () -> jmod("create",
                            "--class-path", "doesNotExist",
                            "output.jmod"),
                 () -> jmod("create",

@@ -416,11 +416,11 @@
         Files.createDirectory(emptyDir);
 
         List<Supplier<JmodResult>> tasks = Arrays.asList(
             () -> jmod("create",
                        "--hash-modules", "anyPattern",
-                       "--modulepath","empty" + pathSeparator + "doesNotExist",
+                       "--module-path","empty" + pathSeparator + "doesNotExist",
                        "output.jmod"),
             () -> jmod("create",
                        "--class-path", "empty" + pathSeparator + "doesNotExist",
                        "output.jmod"),
             () -> jmod("create",

@@ -465,11 +465,11 @@
         List<Supplier<JmodResult>> tasks = Arrays.asList(
                 () -> jmod("create",
                            "--class-path", "aFile.txt",
                            "output.jmod"),
                 () -> jmod("create",
-                           "--modulepath", "aFile.txt",
+                           "--module-path", "aFile.txt",
                            "output.jmod"),
                 () -> jmod("create",
                            "--cmds", "aFile.txt",
                            "output.jmod"),
                 () -> jmod("create",