# HG changeset patch # User coffeys # Date 1442596784 -3600 # Node ID b05bcef3e1b50d74a85bd6c59c278bf3c7a90872 # Parent a58579b3e84504be7d0257b1dd488c3d6a940b15 8077874: [TESTBUG] com/sun/corba/cachedSocket/7056731.sh should not be run on JRE Reviewed-by: chegar diff -r a58579b3e845 -r b05bcef3e1b5 test/com/sun/corba/cachedSocket/7056731.sh --- a/test/com/sun/corba/cachedSocket/7056731.sh Fri Sep 18 17:54:28 2015 +0100 +++ b/test/com/sun/corba/cachedSocket/7056731.sh Fri Sep 18 18:19:44 2015 +0100 @@ -64,12 +64,12 @@ sleep 2 #give orbd time to start echo "started orb" echo "starting server" -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp . HelloServer -ORBInitialPort $PORT -ORBInitialHost localhost & +${JAVA} ${TESTVMOPTS} -cp . HelloServer -ORBInitialPort $PORT -ORBInitialHost localhost & SERVER_PROC=$! sleep 2 #give server time to start echo "started server" echo "starting client (debug mode)" -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp . -agentlib:jdwp=transport=dt_socket,server=y,address=8000 HelloClient -ORBInitialPort $PORT -ORBInitialHost localhost > client.$$ 2>&1 & +${JAVA} ${TESTVMOPTS} -cp . -agentlib:jdwp=transport=dt_socket,server=y,address=8000 HelloClient -ORBInitialPort $PORT -ORBInitialHost localhost > client.$$ 2>&1 & JVM_PROC=$! sleep 2 #give jvm/debugger/client time to start @@ -97,7 +97,7 @@ echo "clear com.sun.corba.se.impl.protocol.CorbaClientRequestDispatcherImpl.unregisterWaiter" sleep 2; echo "resume 1"; -)| ${TESTJAVA}${FS}bin${FS}jdb -connect com.sun.jdi.SocketAttach:hostname=localhost,port=8000 +)| ${COMPILEJAVA}${FS}bin${FS}jdb -connect com.sun.jdi.SocketAttach:hostname=localhost,port=8000 sleep 5 # give time for Client to throw exception