From 65fa012667a622eb2583c160f6092eaf5356f595 Mon Sep 17 00:00:00 2001 From: Mark Sheppard Date: Mon, 5 Jan 2015 23:53:05 +0000 Subject: [PATCH] 8067151: [TESTBUG] com/sun/corba/5036554/TestCorbaBug.sh Changed TESTJAVA to COMPILEJAVA for javac and idlj paths. Reviewed-by: chegar --- jdk/test/com/sun/corba/5036554/TestCorbaBug.sh | 4 ++-- jdk/test/com/sun/corba/cachedSocket/7056731.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh b/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh index 4f0ff231a99..e8b4365b68f 100644 --- a/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh +++ b/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh @@ -75,13 +75,13 @@ ${TESTJAVA}${FS}bin${FS}java -version mkdir bug cp ${TESTSRC}${FS}bug.idl . -${TESTJAVA}${FS}bin${FS}idlj bug.idl +${COMPILEJAVA}${FS}bin${FS}idlj bug.idl cp ${TESTSRC}${FS}JavaBug.java bug chmod -fR 777 bug -${TESTJAVA}${FS}bin${FS}javac -d . bug${FS}*.java +${COMPILEJAVA}${FS}bin${FS}javac -d . bug${FS}*.java ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp . bug/JavaBug > test.out 2>&1 diff --git a/jdk/test/com/sun/corba/cachedSocket/7056731.sh b/jdk/test/com/sun/corba/cachedSocket/7056731.sh index 3db0f73660f..2e5e3fb8547 100644 --- a/jdk/test/com/sun/corba/cachedSocket/7056731.sh +++ b/jdk/test/com/sun/corba/cachedSocket/7056731.sh @@ -55,8 +55,8 @@ PORT=1052 cp -r ${TESTSRC}${FS}*.java ${TESTSRC}${FS}Hello.idl . echo "Testing...please wait" -${TESTJAVA}${FS}bin${FS}idlj -fall Hello.idl -${TESTJAVA}${FS}bin${FS}javac *.java HelloApp/*.java +${COMPILEJAVA}${FS}bin${FS}idlj -fall Hello.idl +${COMPILEJAVA}${FS}bin${FS}javac *.java HelloApp/*.java echo "starting orbd" ${TESTJAVA}${FS}bin${FS}orbd -ORBInitialPort $PORT -ORBInitialHost localhost &