1.1 --- a/test/compiler/6894807/Test6894807.sh Wed May 09 16:24:07 2012 +0200 1.2 +++ b/test/compiler/6894807/Test6894807.sh Fri May 11 17:24:32 2012 +0100 1.3 @@ -18,8 +18,6 @@ 1.4 exit 1 1.5 fi 1.6 1.7 -BIT_FLAG="" 1.8 - 1.9 # set platform-dependent variables 1.10 OS=`uname -s` 1.11 case "$OS" in 1.12 @@ -27,12 +25,6 @@ 1.13 NULL=/dev/null 1.14 PS=":" 1.15 FS="/" 1.16 - ## for solaris, linux it's HOME 1.17 - FILE_LOCATION=$HOME 1.18 - if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ] 1.19 - then 1.20 - BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT | grep -v '^#'` 1.21 - fi 1.22 ;; 1.23 Windows_* ) 1.24 NULL=NUL 1.25 @@ -50,9 +42,9 @@ 1.26 1.27 THIS_DIR=`pwd` 1.28 1.29 -${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version 1.30 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version 1.31 1.32 -${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -server IsInstanceTest > test.out 2>&1 1.33 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} IsInstanceTest > test.out 2>&1 1.34 1.35 cat test.out 1.36