diff -r a67de45e0b25 -r 270b6925cbc8 jdk/test/java/util/ResourceBundle/Bug6299235Test.sh --- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Dec 16 11:49:37 2014 -0800 +++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Dec 16 12:48:31 2014 -0800 @@ -55,27 +55,14 @@ exit 1 fi -# See if TESTJAVA points to JRE or JDK -if [ -d "${TESTJAVA}${FILESEP}jre" ]; then - JRE_EXT_DIR=${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}ext -else - JRE_EXT_DIR=${TESTJAVA}${FILESEP}lib${FILESEP}ext -fi - -if [ -d "${JRE_EXT_DIR}" ]; then - NEW_EXT_DIR="${JRE_EXT_DIR}${PATHSEP}${TESTSRC}" -else - NEW_EXT_DIR=${TESTSRC} -fi - echo "TESTJAVA=${TESTJAVA}" echo "TESTSRC=${TESTSRC}" echo "TESTCLASSES=${TESTCLASSES}" echo "NEW_EXT_DIR=${NEW_EXT_DIR}" cd ${TESTSRC} - -${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.ext.dirs=${NEW_EXT_DIR} Bug6299235Test +echo +${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}awtres.jar Bug6299235Test if [ $? -ne 0 ] then