8055033: Shell tests for jrunscript don't pass through VM options
Summary: passed jtreg env variables TESTVMOPTS, TESTJAVAOPTS to java and TESTTOOLVMOPTS, TESTJAVACOPTS to javac launchers
Reviewed-by: sundar
Contributed-by: srinivas.dama@oracle.com
--- a/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh Thu Oct 13 00:45:38 2016 -0700
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh Thu Oct 13 01:59:39 2016 -0700
@@ -33,7 +33,7 @@
. ${TESTSRC-.}/common.sh
setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
if [ $? -eq 2 ]; then
echo "No js engine found and engine not required; test vacuously passes."
exit 0
--- a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh Thu Oct 13 00:45:38 2016 -0700
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh Thu Oct 13 01:59:39 2016 -0700
@@ -33,7 +33,7 @@
. ${TESTSRC-.}/common.sh
setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
if [ $? -eq 2 ]; then
echo "No js engine found and engine not required; test vacuously passes."
exit 0
--- a/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh Thu Oct 13 00:45:38 2016 -0700
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh Thu Oct 13 01:59:39 2016 -0700
@@ -33,14 +33,14 @@
. ${TESTSRC-.}/common.sh
setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
if [ $? -eq 2 ]; then
echo "No js engine found and engine not required; test vacuously passes."
exit 0
fi
rm -f Hello.class
-${JAVAC} ${TESTSRC}/Hello.java -d .
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} ${TESTSRC}/Hello.java -d .
# we check whether classpath setting for app classes
# work with jrunscript. Script should be able to
--- a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh Thu Oct 13 00:45:38 2016 -0700
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh Thu Oct 13 01:59:39 2016 -0700
@@ -33,7 +33,7 @@
. ${TESTSRC-.}/common.sh
setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
if [ $? -eq 2 ]; then
echo "No js engine found and engine not required; test vacuously passes."
exit 0
--- a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh Thu Oct 13 00:45:38 2016 -0700
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh Thu Oct 13 01:59:39 2016 -0700
@@ -33,7 +33,7 @@
. ${TESTSRC-.}/common.sh
setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
if [ $? -eq 2 ]; then
echo "No js engine found and engine not required; test vacuously passes."
exit 0
--- a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh Thu Oct 13 00:45:38 2016 -0700
+++ b/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh Thu Oct 13 01:59:39 2016 -0700
@@ -33,7 +33,7 @@
. ${TESTSRC-.}/common.sh
setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
if [ $? -eq 2 ]; then
echo "No js engine found and engine not required; test vacuously passes."
exit 0