--- a/jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -113,7 +113,8 @@
case "$OS" in
Windows* | CYGWIN* )
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
*.java
status=$?
if [ ! $status -eq "0" ]; then
@@ -123,7 +124,8 @@
SunOS | Linux )
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
*.java
status=$?
if [ ! $status -eq "0" ]; then
@@ -133,7 +135,8 @@
Darwin)
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
*.java
status=$?
if [ ! $status -eq "0" ]; then
@@ -151,14 +154,16 @@
case "$OS" in
Windows* | CYGWIN* )
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
TestWrapped sun.awt.windows.WToolkit
status=$?
if [ ! $status -eq "0" ]; then
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.windows.WToolkit";
fi
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
-Dawt.toolkit=sun.awt.windows.WToolkit \
TestWrapped sun.awt.windows.WToolkit
status=$?
@@ -169,7 +174,8 @@
SunOS | Linux )
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
-Dawt.toolkit=sun.awt.X11.XToolkit \
TestWrapped sun.awt.X11.XToolkit
status=$?
@@ -177,7 +183,8 @@
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.xawt.XToolkit";
fi
AWT_TOOLKIT=XToolkit ${TESTJAVA}/bin/java ${TESTVMOPTS} \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
-Djava.awt.headless=true \
TestWrapped sun.awt.X11.XToolkit
status=$?
@@ -188,14 +195,16 @@
Darwin)
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
TestWrapped sun.lwawt.macosx.LWCToolkit
status=$?
if [ ! $status -eq "0" ]; then
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.lwawt.macosx.LWCToolkit";
fi
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
- -XaddExports:java.desktop/sun.awt=ALL-UNNAMED,java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
+ -XaddExports:java.desktop/sun.awt=ALL-UNNAMED \
+ -XaddExports:java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
-Dawt.toolkit=sun.lwawt.macosx.LWCToolkit \
TestWrapped sun.lwawt.macosx.LWCToolkit
status=$?
--- a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java Tue Apr 05 21:18:01 2016 +0100
@@ -61,8 +61,8 @@
* loads all the classes in the BCL, get their declared fields,
* and call setAccessible(false) followed by setAccessible(true);
* @modules java.base/jdk.internal.module
- * @run main/othervm FieldSetAccessibleTest UNSECURE
- * @run main/othervm FieldSetAccessibleTest SECURE
+ * @run main/othervm -Djdk.launcher.addmods=ALL-SYSTEM FieldSetAccessibleTest UNSECURE
+ * @run main/othervm -Djdk.launcher.addmods=ALL-SYSTEM FieldSetAccessibleTest SECURE
*
* @author danielfuchs
*/
--- a/jdk/test/java/net/Authenticator/B4933582.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/net/Authenticator/B4933582.sh Tue Apr 05 21:18:01 2016 +0100
@@ -44,7 +44,7 @@
;;
esac
-EXTRAOPTS="-XaddExports:java.base/sun.net.www=ALL-UNNAMED,java.base/sun.net.www.protocol.http=ALL-UNNAMED"
+EXTRAOPTS="-XaddExports:java.base/sun.net.www=ALL-UNNAMED -XaddExports:java.base/sun.net.www.protocol.http=ALL-UNNAMED"
export EXTRAOPTS
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . \
--- a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Apr 05 21:18:01 2016 +0100
@@ -51,6 +51,10 @@
mkdir -p ext
$COMPILEJAVA/bin/jar ${TESTTOOLVMOPTS} cf ext/ext.jar -C $TESTCLASSES ExtLoadedImpl.class -C $TESTCLASSES ExtLoadedImpl_Stub.class -C $TESTCLASSES CheckLoader.class
-TESTVMOPTS="${TESTVMOPTS} -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,java.rmi/sun.rmi.server=ALL-UNNAMED,java.rmi/sun.rmi.transport=ALL-UNNAMED,java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
+TESTVMOPTS="${TESTVMOPTS} \
+ -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED \
+ -XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED \
+ -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED \
+ -XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
$TESTJAVA/bin/java ${TESTVMOPTS} -cp classes -Dtest.src=$TESTSRC -Dtest.classes=$TESTCLASSES -Djava.security.policy=$TESTSRC/security.policy -Djava.ext.dirs=ext ExtLoadedImplTest
--- a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java Tue Apr 05 21:18:01 2016 +0100
@@ -138,9 +138,11 @@
p.put("java.security.policy", TestParams.defaultGroupPolicy);
CommandEnvironment cmd = new ActivationGroupDesc.CommandEnvironment(
null,
- new String[] { "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.server=ALL-UNNAMED,java.rmi/sun.rmi.transport=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" });
+ new String[] {
+ "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" });
ActivationGroupDesc groupDesc =
new ActivationGroupDesc("MyActivationGroupImpl",
--- a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java Tue Apr 05 21:18:01 2016 +0100
@@ -120,9 +120,12 @@
//
System.err.println("Create activation group, in a new VM");
CommandEnvironment cmd = new ActivationGroupDesc.CommandEnvironment(null,
- new String[] { "-XaddExports:java.base/sun.security.provider=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.registry=ALL-UNNAMED,java.rmi/sun.rmi.server=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.transport=ALL-UNNAMED,java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" });
+ new String[] {
+ "-XaddExports:java.base/sun.security.provider=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED",
+ "-XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" });
ActivationGroupDesc groupDesc =
new ActivationGroupDesc(p, cmd);
--- a/jdk/test/java/rmi/registry/readTest/readTest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/rmi/registry/readTest/readTest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -98,7 +98,11 @@
;;
esac
# trailing / after code base is important for rmi codebase property.
-TESTVMOPTS="${TESTVMOPTS} -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,java.rmi/sun.rmi.server=ALL-UNNAMED,java.rmi/sun.rmi.transport=ALL-UNNAMED,java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
+TESTVMOPTS="${TESTVMOPTS} \
+ -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED \
+ -XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED \
+ -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED \
+ -XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
TEST_PID=$!
#bulk of testcase - let it run for a while
--- a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java Tue Apr 05 21:18:01 2016 +0100
@@ -123,9 +123,10 @@
propOption + property +
equal +
propertyValue + extraProp +
- " -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.server=ALL-UNNAMED,java.rmi/sun.rmi.transport=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" +
" -Drmi.registry.port=" +
REGISTRY_PORT,
"");
--- a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java Tue Apr 05 21:18:01 2016 +0100
@@ -74,10 +74,10 @@
try {
String options = " -Djava.security.policy=" +
TestParams.defaultPolicy +
- " -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED," +
- "java.rmi/sun.rmi.server=ALL-UNNAMED," +
- "java.rmi/sun.rmi.transport=ALL-UNNAMED," +
- "java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED" +
+ " -XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" +
" -Djava.rmi.dgc.leaseValue=500000" +
" -Dsun.rmi.dgc.checkInterval=" +
(HOLD_TARGET_TIME - 5000) +
--- a/jdk/test/java/util/Locale/LocaleProviders.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/util/Locale/LocaleProviders.sh Tue Apr 05 21:18:01 2016 +0100
@@ -122,7 +122,8 @@
tznp8013086
EOF
-EXTRAOPTS="-XaddExports:java.base/sun.util.locale=ALL-UNNAMED,java.base/sun.util.locale.provider=ALL-UNNAMED"
+EXTRAOPTS="-XaddExports:java.base/sun.util.locale=ALL-UNNAMED \
+ -XaddExports:java.base/sun.util.locale.provider=ALL-UNNAMED"
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${SPIDIR}${FS}dest \
${SPIDIR}${FS}src${FS}tznp.java \
--- a/jdk/test/java/util/PluggableLocale/ExecTest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -93,7 +93,8 @@
esac
-EXTRA_OPTS="-XaddExports:java.base/sun.util.locale.provider=ALL-UNNAMED,java.base/sun.util.resources=ALL-UNNAMED"
+EXTRA_OPTS="-XaddExports:java.base/sun.util.locale.provider=ALL-UNNAMED \
+ -XaddExports:java.base/sun.util.resources=ALL-UNNAMED"
# compile
cp ${TESTSRC}${FS}ProviderTest.java .
--- a/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java Tue Apr 05 21:18:01 2016 +0100
@@ -26,7 +26,7 @@
* @summary Verify the defining class loader of each module never delegates
* to its child class loader. Also sanity check java.compact2
* requires.
- * @run testng VerifyModuleDelegation
+ * @run testng/othervm -Djdk.launcher.addmods=ALL-SYSTEM VerifyModuleDelegation
*/
import java.lang.module.ModuleDescriptor;
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -51,7 +51,8 @@
DEBUGOPTIONS=""
export DEBUGOPTIONS
-EXTRAOPTIONS="-XaddExports:java.management/sun.management=ALL-UNNAMED,java.management/sun.management.jmxremote=ALL-UNNAMED"
+EXTRAOPTIONS="-XaddExports:java.management/sun.management=ALL-UNNAMED \
+ -XaddExports:java.management/sun.management.jmxremote=ALL-UNNAMED"
export EXTRAOPTIONS
# Call the common generic test
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -49,7 +49,8 @@
DEBUGOPTIONS=""
export DEBUGOPTIONS
-EXTRAOPTIONS="-XaddExports:java.management/sun.management=ALL-UNNAMED,java.management/sun.management.jmxremote=ALL-UNNAMED"
+EXTRAOPTIONS="-XaddExports:java.management/sun.management=ALL-UNNAMED \
+ -XaddExports:java.management/sun.management.jmxremote=ALL-UNNAMED"
export EXTRAOPTIONS
# Call the common generic test
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -48,7 +48,8 @@
DEBUGOPTIONS=""
export DEBUGOPTIONS
-EXTRAOPTIONS="-XaddExports:java.management/sun.management=ALL-UNNAMED,java.management/sun.management.jmxremote=ALL-UNNAMED"
+EXTRAOPTIONS="-XaddExports:java.management/sun.management=ALL-UNNAMED \
+ -XaddExports:java.management/sun.management.jmxremote=ALL-UNNAMED"
export EXTRAOPTIONS
# Call the common generic test
--- a/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java Tue Apr 05 21:18:01 2016 +0100
@@ -68,9 +68,10 @@
// (neither on standard output, nor on standard err streams).
JavaVM vm = new JavaVM(
DoRMIStuff.class.getName(),
- "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.server=ALL-UNNAMED,java.rmi/sun.rmi.transport=ALL-UNNAMED,"
- + "java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
+ "-XaddExports:java.rmi/sun.rmi.registry=ALL-UNNAMED"
+ + " -XaddExports:java.rmi/sun.rmi.server=ALL-UNNAMED"
+ + " -XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED"
+ + " -XaddExports:java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
+ " -Djava.util.logging.config.file="
+ loggingPropertiesFile, "", out, err);
vm.execute();
--- a/jdk/test/sun/security/krb5/tools/ktcheck.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/security/krb5/tools/ktcheck.sh Tue Apr 05 21:18:01 2016 +0100
@@ -61,7 +61,8 @@
EXTRA_OPTIONS="-Djava.security.krb5.conf=${TESTSRC}${FS}onlythree.conf"
KTAB="${TESTJAVA}${FS}bin${FS}ktab -J${EXTRA_OPTIONS} -k $KEYTAB -f"
CHECK="${TESTJAVA}${FS}bin${FS}java -cp ${TESTCLASSES} ${TESTVMOPTS} ${EXTRA_OPTIONS} \
- -XaddExports:java.security.jgss/sun.security.krb5.internal.ktab=ALL-UNNAMED,java.security.jgss/sun.security.krb5=ALL-UNNAMED \
+ -XaddExports:java.security.jgss/sun.security.krb5.internal.ktab=ALL-UNNAMED \
+ -XaddExports:java.security.jgss/sun.security.krb5=ALL-UNNAMED \
KtabCheck $KEYTAB"
echo ${EXTRA_OPTIONS}
--- a/jdk/test/sun/security/tools/jarsigner/ts.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/security/tools/jarsigner/ts.sh Tue Apr 05 21:18:01 2016 +0100
@@ -95,7 +95,11 @@
$KT -alias ca -gencert -ext eku:critical=cs | \
$KT -alias tsbad3 -importcert
-EXTRAOPTS="-XaddExports:java.base/sun.misc=ALL-UNNAMED,java.base/sun.security.pkcs=ALL-UNNAMED,java.base/sun.security.timestamp=ALL-UNNAMED,java.base/sun.security.x509=ALL-UNNAMED,java.base/sun.security.util=ALL-UNNAMED"
+EXTRAOPTS="-XaddExports:java.base/sun.misc=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.pkcs=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.timestamp=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.x509=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.util=ALL-UNNAMED"
$JAVAC ${EXTRAOPTS} -d . ${TESTSRC}/TimestampCheck.java
$JAVA ${TESTVMOPTS} ${EXTRAOPTS} "-Dtest.tool.vm.opts=${TESTTOOLVMOPTS}" TimestampCheck
--- a/jdk/test/sun/security/tools/keytool/autotest.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/security/tools/keytool/autotest.sh Tue Apr 05 21:18:01 2016 +0100
@@ -100,7 +100,9 @@
echo "Using NSS lib at $LIBNAME"
-EXTRAOPTS="-XaddExports:java.base/sun.security.tools.keytool=ALL-UNNAMED,java.base/sun.security.util=ALL-UNNAMED,java.base/sun.security.x509=ALL-UNNAMED"
+EXTRAOPTS="-XaddExports:java.base/sun.security.tools.keytool=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.util=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.x509=ALL-UNNAMED"
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . -XDignore.symbol.file \
${TESTSRC}${FS}KeyToolTest.java || exit 10
--- a/jdk/test/sun/security/tools/keytool/standard.sh Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/sun/security/tools/keytool/standard.sh Tue Apr 05 21:18:01 2016 +0100
@@ -57,7 +57,9 @@
;;
esac
-EXTRAOPTS="-XaddExports:java.base/sun.security.tools.keytool=ALL-UNNAMED,java.base/sun.security.util=ALL-UNNAMED,java.base/sun.security.x509=ALL-UNNAMED"
+EXTRAOPTS="-XaddExports:java.base/sun.security.tools.keytool=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.util=ALL-UNNAMED \
+ -XaddExports:java.base/sun.security.x509=ALL-UNNAMED"
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . -XDignore.symbol.file ${TESTSRC}${FS}KeyToolTest.java || exit 10
--- a/jdk/test/tools/jimage/VerifyJimage.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/tools/jimage/VerifyJimage.java Tue Apr 05 21:18:01 2016 +0100
@@ -49,6 +49,7 @@
* @test
* @summary Verify jimage
* @modules java.base/jdk.internal.jimage
+ * @run main/othervm -Djdk.launcher.addmods=ALL-SYSTEM VerifyJimage
*/
/**
--- a/jdk/test/tools/launcher/modules/patch/PatchTest.java Tue Apr 05 11:48:30 2016 -0700
+++ b/jdk/test/tools/launcher/modules/patch/PatchTest.java Tue Apr 05 21:18:01 2016 +0100
@@ -128,18 +128,15 @@
// value for -Xpatch
String patchPath = PATCHES1_DIR + File.pathSeparator + PATCHES2_DIR;
- // value for -XaddExports
- String addExportsValue = "java.base/java.lang2=test"
- + ",jdk.naming.dns/com.sun.jndi.dns=test"
- + ",jdk.naming.dns/com.sun.jndi.dns2=test"
- + ",jdk.compiler/com.sun.tools.javac2=test";
-
// the argument to the test is the list of classes overridden or added
String arg = Stream.of(CLASSES).collect(Collectors.joining(","));
int exitValue
= executeTestJava("-Xpatch:" + patchPath,
- "-XaddExports:" + addExportsValue,
+ "-XaddExports:java.base/java.lang2=test",
+ "-XaddExports:jdk.naming.dns/com.sun.jndi.dns=test",
+ "-XaddExports:jdk.naming.dns/com.sun.jndi.dns2=test",
+ "-XaddExports:jdk.compiler/com.sun.tools.javac2=test",
"-addmods", "jdk.naming.dns,jdk.compiler",
"-mp", MODS_DIR.toString(),
"-m", "test/jdk.test.Main", arg)