diff --git a/jdk/test/javax/xml/jaxp/common/8035437/Document.java b/jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/Document.java rename to jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Document.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/Node.java b/jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/Node.java rename to jdk/test/javax/xml/jaxp/common/8035437/patch-src1/org/w3c/dom/Node.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/DocumentImpl.java b/jdk/test/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java similarity index 100% rename from jdk/test/javax/xml/jaxp/common/8035437/DocumentImpl.java rename to jdk/test/javax/xml/jaxp/common/8035437/patch-src2/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java diff --git a/jdk/test/javax/xml/jaxp/common/8035437/run.sh b/jdk/test/javax/xml/jaxp/common/8035437/run.sh index ea377c67281..9b1d327e6d2 100644 --- a/jdk/test/javax/xml/jaxp/common/8035437/run.sh +++ b/jdk/test/javax/xml/jaxp/common/8035437/run.sh @@ -28,13 +28,43 @@ # @summary Tests that java.lang.AbstractMethodError is not thrown when # serializing improper version of DocumentImpl class. +OS=`uname -s` +case "$OS" in + SunOS ) + PS=":" + ;; + Linux ) + PS=":" + ;; + Darwin ) + PS=":" + ;; + AIX ) + PS=":" + ;; + Windows*) + PS=";" + ;; + CYGWIN*) + PS=";" + ;; + * ) + echo "Unrecognized system!" + exit 1; + ;; +esac + 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${PS}$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/jdk/test/sun/text/IntHashtable/Bug4170614Test.sh b/jdk/test/sun/text/IntHashtable/Bug4170614Test.sh index 0c31934d01c..e70f4905831 100644 --- a/jdk/test/sun/text/IntHashtable/Bug4170614Test.sh +++ b/jdk/test/sun/text/IntHashtable/Bug4170614Test.sh @@ -60,8 +60,8 @@ cd ${TESTSRC} 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/jdk/test/sun/text/IntHashtable/Bug4170614Test.java b/jdk/test/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java similarity index 100% rename from jdk/test/sun/text/IntHashtable/Bug4170614Test.java rename to jdk/test/sun/text/IntHashtable/patch-src/java/text/Bug4170614Test.java diff --git a/jdk/test/tools/launcher/ToolsOpts.java b/jdk/test/tools/launcher/ToolsOpts.java index f8920c6acd7..5837c62e015 100644 --- a/jdk/test/tools/launcher/ToolsOpts.java +++ b/jdk/test/tools/launcher/ToolsOpts.java @@ -87,11 +87,16 @@ public class ToolsOpts extends TestHelper { contents.add(" }\n"); contents.add(" }\n"); contents.add("}\n"); - createFile(new File(mainJava), contents); + String mainJavaPath = "patch-src/com/sun/tools/javac/" + mainJava; + File mainJavaFile = new File(mainJavaPath.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/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java b/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java index 968336ae8aa..15457cf7664 100644 --- a/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java +++ b/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java @@ -105,22 +105,24 @@ public class PatchTest { 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/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java b/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java index 711bedf8e3a..5ada5888d92 100644 --- a/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java +++ b/jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java @@ -93,20 +93,22 @@ public class PatchTestWarningError { 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/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java b/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java index 9a5c84cad99..1f1ff316114 100644 --- a/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java +++ b/jdk/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java @@ -73,9 +73,10 @@ public class PatchSystemModules { } // compile patched source + String patchDir = PATCH_SRC_DIR.resolve(JAVA_BASE).toString(); assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve(JAVA_BASE), PATCH_DIR.resolve(JAVA_BASE), - "-Xmodule:java.base")); + "--patch-module", "java.base=" + patchDir)); assertTrue(CompilerUtils.compile(PATCH_SRC_DIR.resolve("m2"), PATCH_DIR.resolve("m2")));