test/tools/launcher/ClassPathWildCard.sh

@@ -119,28 +119,28 @@
   variant=$1
   NOOP=$2
 
   # 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
 
 
   # Throw some class files into the mix
   cp TestC/*.class JarDir
   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
 }
 
 CreateJarFiles A
 CreateJarFiles B