test/runtime/6929067/Test6929067.sh

*** 17,28 ****
    TESTJAVA=`dirname ${PARENT}`
    echo "TESTJAVA not set, selecting " ${TESTJAVA}
    echo "If this is incorrect, try setting the variable manually."
  fi
  
- BIT_FLAG=""
- 
  # set platform-dependent variables
  OS=`uname -s`
  case "$OS" in
    Linux)
      NULL=/dev/null
--- 17,26 ----
*** 35,60 ****
      FS="\\"
      echo "Test passed; only valid for Linux"
      exit 0;
      ;;
    * )
!     echo "Unrecognized system!"
      exit 1;
      ;;
  esac
  
! LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/i386/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
  export LD_LIBRARY_PATH
  
  THIS_DIR=`pwd`
  
  cp ${TESTSRC}${FS}invoke.c ${THIS_DIR}
  cp ${TESTSRC}${FS}T.java ${THIS_DIR}
  
  
! ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -fullversion
  
  ${TESTJAVA}${FS}bin${FS}javac T.java
  
! gcc -o invoke -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c ${TESTJAVA}/jre/lib/i386/client/libjvm.so
  ./invoke
  exit $?
--- 33,67 ----
      FS="\\"
      echo "Test passed; only valid for Linux"
      exit 0;
      ;;
    * )
!     echo "Unrecognized system: $OS"
      exit 1;
      ;;
  esac
  
! # Choose arch: i386 or amd64 (test is Linux-specific)
! echo ${TESTVMOPTS} | grep d64 >/dev/null
! if [ "$?" = "0" ]
! then
!   ARCH=amd64
! else
!   ARCH=i386
! fi
! 
! LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/${ARCH}/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH
  export LD_LIBRARY_PATH
  
  THIS_DIR=`pwd`
  
  cp ${TESTSRC}${FS}invoke.c ${THIS_DIR}
  cp ${TESTSRC}${FS}T.java ${THIS_DIR}
  
  
! ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -fullversion
  
  ${TESTJAVA}${FS}bin${FS}javac T.java
  
! gcc -o invoke -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c ${TESTJAVA}/jre/lib/${ARCH}/client/libjvm.so
  ./invoke
  exit $?