test/sun/net/www/protocol/jar/jarbug/run.sh

rev 1540 : 6867657: Many JSN tests do not run under cygwin
Reviewed-by: ohair
rev 1541 : 8003890: corelibs test scripts should pass TESTVMOPTS
Reviewed-by: chegar, alanb
Contributed-by: Mark Sheppard <mark.sheppard@oracle.com>

*** 26,52 ****
  # @test
  # @bug 4361044 4388202 4418643 4523159 4730642
  # @summary various resource and classloading bugs related to jar files
  #set -x
  DEST=`pwd`
  #
  # build jar1 
  #
! mkdir ${DEST}/jar1
! cd ${TESTSRC}/etc/jar1 
! cp -r . ${DEST}/jar1
! ${TESTJAVA}/bin/javac -d ${DEST}/jar1 ${TESTSRC}/src/jar1/LoadResourceBundle.java
! ${TESTJAVA}/bin/javac -d ${DEST}/jar1 ${TESTSRC}/src/jar1/GetResource.java
! cd ${DEST}/jar1
! ${TESTJAVA}/bin/jar cfM jar1.jar jar1 res1.txt
  mv jar1.jar ..
  #
  # build the test sources and run them
  #
! ${TESTJAVA}/bin/javac -d ${DEST} ${TESTSRC}/src/test/*.java
  cd ${DEST}
! ${TESTJAVA}/bin/java RunAllTests
  result=$?
  if [ "$result" -ne "0" ]; then
      exit 1
  fi
  rm -rf *
--- 26,83 ----
  # @test
  # @bug 4361044 4388202 4418643 4523159 4730642
  # @summary various resource and classloading bugs related to jar files
  #set -x
  DEST=`pwd`
+ 
+ OS=`uname -s`
+ case "$OS" in
+   SunOS )
+     PS=":"
+     FS="/"
+     ;;
+   Linux )
+     PS=":"
+     FS="/"
+     ;;
+   Windows* )
+     PS=";"
+     FS="\\"
+     ;;
+   CYGWIN* )
+     PS=";"
+     FS="/"
+     #
+     # javac does not like /cygdrive produced by `pwd`.
+     #
+     DEST=`cygpath -d ${DEST}`
+     ;;
+   * )
+     echo "Unrecognized system!"
+     exit 1;
+     ;;
+ esac
+ 
  #
  # build jar1 
  #
! mkdir -p ${DEST}${FS}jar1
! cd ${TESTSRC}${FS}etc${FS}jar1 
! cp -r . ${DEST}${FS}jar1
! ${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
!     ${TESTSRC}${FS}src${FS}jar1${FS}LoadResourceBundle.java
! ${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
!     ${TESTSRC}${FS}src${FS}jar1${FS}GetResource.java
! cd ${DEST}${FS}jar1
! ${TESTJAVA}${FS}bin${FS}jar cfM jar1.jar jar1 res1.txt
  mv jar1.jar ..
  #
  # build the test sources and run them
  #
! ${TESTJAVA}${FS}bin${FS}javac -d ${DEST} ${TESTSRC}${FS}src${FS}test${FS}*.java
  cd ${DEST}
! ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} RunAllTests
  result=$?
  if [ "$result" -ne "0" ]; then
      exit 1
  fi
  rm -rf *