# HG changeset patch
# User jlahoda
# Date 1486395384 -3600
#      Mon Feb 06 16:36:24 2017 +0100
# Node ID 73f095fbc5c6fb4478e39dd355e293031b219744
# Parent  3b4c9ed404f06a1ee37a5ebb4bc68598882ee9d7
imported patch xmodule-to-patch-module

diff --git a/test/javax/xml/jaxp/common/8035437/Document.java b/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java
rename from test/javax/xml/jaxp/common/8035437/Document.java
rename to test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java
diff --git a/test/javax/xml/jaxp/common/8035437/Node.java b/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java
rename from test/javax/xml/jaxp/common/8035437/Node.java
rename to test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java
diff --git a/test/javax/xml/jaxp/common/8035437/DocumentImpl.java b/test/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
rename from test/javax/xml/jaxp/common/8035437/DocumentImpl.java
rename to test/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
diff --git a/test/javax/xml/jaxp/common/8035437/run.sh b/test/javax/xml/jaxp/common/8035437/run.sh
--- a/test/javax/xml/jaxp/common/8035437/run.sh
+++ b/test/javax/xml/jaxp/common/8035437/run.sh
@@ -31,10 +31,10 @@
 mkdir -p exec/java.xml compile/java.xml
 
 $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-   -d compile/java.xml -Xmodule:java.xml $TESTSRC/Document.java $TESTSRC/Node.java || exit 1
+   -d compile/java.xml --patch-module java.xml=$TESTSRC/patch-src1 $TESTSRC/patch-src1/org/w3c/dom/Document.java $TESTSRC/patch-src1/org/w3c/dom/Node.java || exit 1
 
 $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-   -d exec/java.xml --patch-module java.xml=compile/java.xml -Xmodule:java.xml $TESTSRC/DocumentImpl.java || exit 2
+   -d exec/java.xml --patch-module java.xml=compile/java.xml:$TESTSRC/patch-src2 $TESTSRC/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java || exit 2
 
 $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
    $TESTSRC/AbstractMethodErrorTest.java -d exec || exit 3
diff --git a/test/sun/text/IntHashtable/Bug4170614Test.sh b/test/sun/text/IntHashtable/Bug4170614Test.sh
--- a/test/sun/text/IntHashtable/Bug4170614Test.sh
+++ b/test/sun/text/IntHashtable/Bug4170614Test.sh
@@ -60,8 +60,8 @@
 TEST_JAVABASE=${TESTCLASSES}/java.base
 mkdir -p ${TEST_JAVABASE}
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
-    -Xmodule:java.base \
-    -d ${TEST_JAVABASE} Bug4170614Test.java
+    --patch-module java.base=patch-src \
+    -d ${TEST_JAVABASE} patch-src/java/text/Bug4170614Test.java
 
 ${TESTJAVA}/bin/java ${TESTVMOPTS} --patch-module java.base=${TEST_JAVABASE} java.text.Bug4170614Test
 
diff --git a/test/sun/text/IntHashtable/Bug4170614Test.java b/test/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java
rename from test/sun/text/IntHashtable/Bug4170614Test.java
rename to test/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java
diff --git a/test/tools/launcher/ToolsOpts.java b/test/tools/launcher/ToolsOpts.java
--- a/test/tools/launcher/ToolsOpts.java
+++ b/test/tools/launcher/ToolsOpts.java
@@ -87,11 +87,13 @@
         contents.add("       }\n");
         contents.add("    }\n");
         contents.add("}\n");
-        createFile(new File(mainJava), contents);
+        File mainJavaFile = new File(("patch-src/com/sun/tools/javac/" + mainJava).replace('/', File.separatorChar));
+        mainJavaFile.getParentFile().mkdirs();
+        createFile(mainJavaFile, contents);
 
         // compile Main.java into directory to override classes in jdk.compiler
         new File("jdk.compiler").mkdir();
-        compile("-Xmodule:jdk.compiler", "-d", "jdk.compiler", mainJava);
+        compile("--patch-module", "jdk.compiler=patch-src", "-d", "jdk.compiler", mainJavaFile.toString());
     }
 
     static void pass(String msg) {
diff --git a/test/tools/launcher/modules/patch/basic/PatchTest.java b/test/tools/launcher/modules/patch/basic/PatchTest.java
--- a/test/tools/launcher/modules/patch/basic/PatchTest.java
+++ b/test/tools/launcher/modules/patch/basic/PatchTest.java
@@ -105,22 +105,22 @@
                                                 MODS_DIR.resolve("test"));
         assertTrue(compiled, "classes did not compile");
 
-        // javac -Xmodule:$MODULE -d patches1/$MODULE patches1/$MODULE/**
+        // javac --patch-module $MODULE=patches1/$MODULE -d patches1/$MODULE patches1/$MODULE/**
         // jar cf patches/$MODULE-1.jar -C patches1/$MODULE .
         for (Path src : Files.newDirectoryStream(SRC1_DIR)) {
             Path output = PATCHES1_DIR.resolve(src.getFileName());
             String mn = src.getFileName().toString();
-            compiled  = CompilerUtils.compile(src, output, "-Xmodule:" + mn);
+            compiled  = CompilerUtils.compile(src, output, "--patch-module", mn + "=" + src.toString());
             assertTrue(compiled, "classes did not compile");
             JarUtils.createJarFile(PATCHES_DIR.resolve(mn + "-1.jar"), output);
         }
 
-        // javac -Xmodule:$MODULE -d patches2/$MODULE patches2/$MODULE/**
+        // javac --patch-module $MODULE=patches2/$MODULE -d patches2/$MODULE patches2/$MODULE/**
         // jar cf patches/$MODULE-2.jar -C patches2/$MODULE .
         for (Path src : Files.newDirectoryStream(SRC2_DIR)) {
             Path output = PATCHES2_DIR.resolve(src.getFileName());
             String mn = src.getFileName().toString();
-            compiled  = CompilerUtils.compile(src, output, "-Xmodule:" + mn);
+            compiled  = CompilerUtils.compile(src, output, "--patch-module", mn + "=" + src.toString());
             assertTrue(compiled, "classes did not compile");
             JarUtils.createJarFile(PATCHES_DIR.resolve(mn + "-2.jar"), output);
         }
diff --git a/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java b/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java
--- a/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java
+++ b/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java
@@ -93,20 +93,20 @@
                                                 MODS_DIR.resolve("test"));
         assertTrue(compiled, "classes did not compile");
 
-        // javac -Xmodule:$MODULE -d patches1/$MODULE patches1/$MODULE/**
+        // javac --patch-module $MODULE=patches1/$MODULE -d patches1/$MODULE patches1/$MODULE/**
         Path src = SRC1_DIR.resolve("java.base");
         Path output = PATCHES1_DIR.resolve(src.getFileName());
         Files.createDirectories(output);
         String mn = src.getFileName().toString();
-        compiled  = CompilerUtils.compile(src, output, "-Xmodule:" + mn);
+        compiled  = CompilerUtils.compile(src, output, "--patch-module", mn + "=" + src.toString());
         assertTrue(compiled, "classes did not compile");
 
-        // javac -Xmodule:$MODULE -d patches2/$MODULE patches2/$MODULE/**
+        // javac --patch-module $MODULE=patches2/$MODULE -d patches2/$MODULE patches2/$MODULE/**
         src = SRC2_DIR.resolve("java.base");
         output = PATCHES2_DIR.resolve(src.getFileName());
         Files.createDirectories(output);
         mn = src.getFileName().toString();
-        compiled  = CompilerUtils.compile(src, output, "-Xmodule:" + mn);
+        compiled  = CompilerUtils.compile(src, output, "--patch-module", mn + "=" + src.toString());
         assertTrue(compiled, "classes did not compile");
 
     }
diff --git a/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java b/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
--- a/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
+++ b/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
@@ -75,7 +75,7 @@
         // compile patched source
         assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve(JAVA_BASE),
                                          PATCH_DIR.resolve(JAVA_BASE),
-                                         "-Xmodule:java.base"));
+                                         "--patch-module", "java.base=" + PATCH_SRC_DIR.resolve(JAVA_BASE).toString()));
         assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve("m2"),
                                          PATCH_DIR.resolve("m2")));