test/compiler/6894807/Test6894807.sh

*** 16,40 ****
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
- BIT_FLAG=""
- 
  # set platform-dependent variables
  OS=`uname -s`
  case "$OS" in
    SunOS | Linux )
      NULL=/dev/null
      PS=":"
      FS="/"
-     ## for solaris, linux it's HOME
-     FILE_LOCATION=$HOME
-     if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ]
-     then
-         BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT | grep -v '^#'`
-     fi
      ;;
    Windows_* )
      NULL=NUL
      PS=";"
      FS="\\"
--- 16,32 ----
*** 48,60 ****
  JEMMYPATH=${CPAPPEND}
  CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
  
  THIS_DIR=`pwd`
  
! ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version
  
! ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -server IsInstanceTest > test.out 2>&1
  
  cat test.out
  
  grep "Failed at index" test.out
  
--- 40,52 ----
  JEMMYPATH=${CPAPPEND}
  CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
  
  THIS_DIR=`pwd`
  
! ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
  
! ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -server IsInstanceTest > test.out 2>&1
  
  cat test.out
  
  grep "Failed at index" test.out