8177741: Fix hotspot tests to use --patch-module instead of -Xmodule
Summary: Change InMemoryJavaCompiler.compile() to accept --patch-module instead of -Xmodule, and then change appropriate tests.
Reviewed-by: coleenp, gtriantafill
--- a/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java Tue Aug 01 16:03:06 2017 +0200
+++ b/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java Thu Aug 10 11:11:52 2017 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -189,8 +189,8 @@
List<String> opts = new ArrayList<>();
String moduleOverride = null;
for (String opt : options) {
- if (opt.startsWith("-Xmodule:")) {
- moduleOverride = opt.substring("-Xmodule:".length());
+ if (opt.startsWith("--patch-module=")) {
+ moduleOverride = opt.substring("--patch-module=".length());
} else {
opts.add(opt);
}