--- old/test/tools/launcher/ClassPathWildCard.sh 2014-01-26 11:38:12.424796628 +0800 +++ new/test/tools/launcher/ClassPathWildCard.sh 2014-01-26 11:38:12.260796630 +0800 @@ -121,11 +121,11 @@ # Test JAR files first rm -f TestA${OUTEXT} - $JAVA${variant} -classpath JarDir/"*"$NOOP TestA || exit 1 + $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir/"*"$NOOP TestA || exit 1 CheckFail TestA rm -f TestB${OUTEXT} - $JAVA${variant} -classpath JarDir/"*"$NOOP TestB || exit 1 + $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir/"*"$NOOP TestB || exit 1 CheckFail TestB @@ -134,11 +134,11 @@ cp TestD/*.class JarDir rm -f TestC${OUTEXT} - $JAVA${variant} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestC || exit 1 + $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestC || exit 1 CheckFail TestC rm -f TestD${OUTEXT} - $JAVA${variant} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestD || exit 1 + $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestD || exit 1 CheckFail TestD }