test/java/awt/JAWT/JAWT.sh

*** 47,57 ****
  case "$OS" in
    Linux )
      NULL=/dev/null
      PS=":"
      FS="/"
!     ${TESTJAVA}${FS}bin${FS}java -version 2>&1 | grep '64-Bit' > $NULL
      if [ $? -eq '0' ]
      then
          ARCH="amd64"
      else
          ARCH="i386"
--- 47,57 ----
  case "$OS" in
    Linux )
      NULL=/dev/null
      PS=":"
      FS="/"
!     ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -version 2>&1 | grep '64-Bit' > $NULL
      if [ $? -eq '0' ]
      then
          ARCH="amd64"
      else
          ARCH="i386"
*** 83,93 ****
      PS=";"
      FS="\\"
      MAKEFILE="Makefile.win"
      CC="cl"
          MAKE="nmake"
!         ${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
      if [ "$?" -eq '0' ]
      then
          ARCH="amd64"
      else
          ARCH="i386"
--- 83,93 ----
      PS=";"
      FS="\\"
      MAKEFILE="Makefile.win"
      CC="cl"
          MAKE="nmake"
!         ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -d64 -version 2>&1 | grep '64-Bit' > $NULL
      if [ "$?" -eq '0' ]
      then
          ARCH="amd64"
      else
          ARCH="i386"
*** 98,108 ****
      NULL=/dev/null
      PS=":"
      FS="/"
      MAKEFILE="Makefile.cygwin"
      CC="gcc"
!         ${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
      if [ "$?" -eq '0' ]
      then
          ARCH="amd64"
      else
          ARCH="i386"
--- 98,108 ----
      NULL=/dev/null
      PS=":"
      FS="/"
      MAKEFILE="Makefile.cygwin"
      CC="gcc"
!         ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -d64 -version 2>&1 | grep '64-Bit' > $NULL
      if [ "$?" -eq '0' ]
      then
          ARCH="amd64"
      else
          ARCH="i386"
*** 127,137 ****
        exit 0
        ;;
  esac
  
  echo "OS-ARCH is" ${SYST}-${ARCH}
! ${TESTJAVA}${FS}jre${FS}bin${FS}java -fullversion 2>&1
  
  which ${MAKE} >${NULL} 2>&1
  if [ "$?" -ne '0' ]
  then
      echo "No make found. Test passed."
--- 127,137 ----
        exit 0
        ;;
  esac
  
  echo "OS-ARCH is" ${SYST}-${ARCH}
! ${TESTJAVA}${FS}jre${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -fullversion 2>&1
  
  which ${MAKE} >${NULL} 2>&1
  if [ "$?" -ne '0' ]
  then
      echo "No make found. Test passed."
*** 160,171 ****
  JAVAC=${TESTJAVA}${FS}bin${FS}javac
  JAVAH=${TESTJAVA}${FS}bin${FS}javah
  
  export CC SYST ARCH LD_LIBRARY_PATH
  
! ${JAVAC} -d . ${TESTSRC}${FS}MyCanvas.java
  ${JAVAH} -jni -classpath . -d . MyCanvas
  ${MAKE} -f ${MAKEFILE}
! ${JAVA} -classpath . MyCanvas
  
  exit $?
  
--- 160,171 ----
  JAVAC=${TESTJAVA}${FS}bin${FS}javac
  JAVAH=${TESTJAVA}${FS}bin${FS}javah
  
  export CC SYST ARCH LD_LIBRARY_PATH
  
! ${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}${FS}MyCanvas.java
  ${JAVAH} -jni -classpath . -d . MyCanvas
  ${MAKE} -f ${MAKEFILE}
! ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . MyCanvas
  
  exit $?