OpenJDK / jigsaw / jake / jdk
changeset 17417:a0f2a493ec38
Fixup merge issue
| author | mchung |
|---|---|
| date | Fri, 19 Aug 2016 21:58:53 -0700 |
| parents | 21fd3f6b6054 |
| children | 801659c39b01 d79358e98507 |
| files | test/com/sun/corba/transport/KeepAliveSockets.java test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java test/sun/rmi/rmic/classpath/RMICClassPathTest.java test/sun/security/util/Resources/NewNamesFormat.java |
| diffstat | 4 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/test/com/sun/corba/transport/KeepAliveSockets.java Fri Aug 19 16:30:13 2016 -0700 +++ b/test/com/sun/corba/transport/KeepAliveSockets.java Fri Aug 19 21:58:53 2016 -0700 @@ -27,11 +27,10 @@ * @summary Introduce option to setKeepAlive parameter on CORBA sockets * * @modules java.corba/com.sun.corba.se.impl.orb java.corba/com.sun.corba.se.impl.transport - * @compile --add-modules=java.corba KeepAliveSockets.java - * @run main/othervm --add-modules=java.corba KeepAliveSockets - * @run main/othervm --add-modules=java.corba -Dcom.sun.CORBA.transport.enableTcpKeepAlive KeepAliveSockets - * @run main/othervm --add-modules=java.corba -Dcom.sun.CORBA.transport.enableTcpKeepAlive=true KeepAliveSockets - * @run main/othervm --add-modules=java.corba -Dcom.sun.CORBA.transport.enableTcpKeepAlive=false KeepAliveSockets + * @run main/othervm KeepAliveSockets + * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive KeepAliveSockets + * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=true KeepAliveSockets + * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=false KeepAliveSockets */ import java.lang.*;
--- a/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java Fri Aug 19 16:30:13 2016 -0700 +++ b/test/javax/xml/bind/xjc/8145039/JaxbMarshallTest.java Fri Aug 19 21:58:53 2016 -0700 @@ -28,8 +28,7 @@ * ClassCast exception. * @modules java.xml.bind * @library /lib/testlibrary - * @compile --add-modules java.xml.bind JaxbMarshallTest.java - * @run testng/othervm --add-modules=java.xml.bind JaxbMarshallTest + * @run testng/othervm JaxbMarshallTest */ import java.io.IOException;
--- a/test/sun/rmi/rmic/classpath/RMICClassPathTest.java Fri Aug 19 16:30:13 2016 -0700 +++ b/test/sun/rmi/rmic/classpath/RMICClassPathTest.java Fri Aug 19 21:58:53 2016 -0700 @@ -32,8 +32,7 @@ * not affect VM global state, so othervm is not required. * @modules jdk.rmic/sun.rmi.rmic * jdk.rmic/sun.tools.java - * @compile --add-modules=jdk.rmic RMICClassPathTest.java - * @run main/othervm --add-modules=jdk.rmic RMICClassPathTest + * @run main RMICClassPathTest */ import java.io.File;
--- a/test/sun/security/util/Resources/NewNamesFormat.java Fri Aug 19 16:30:13 2016 -0700 +++ b/test/sun/security/util/Resources/NewNamesFormat.java Fri Aug 19 21:58:53 2016 -0700 @@ -29,7 +29,7 @@ * jdk.jartool/sun.security.tools.jarsigner * jdk.policytool/sun.security.tools.policytool * @summary security/util/Resources.java needs improvement - * @run main/othervm --add-modules=jdk.policytool NewNamesFormat + * @run main/othervm NewNamesFormat */