Mercurial > hg > openjdk > jdk8u > jdk
changeset 4451:39498fc31d63
7012365: TEST_BUG: test/java/nio/charset/spi/basic.sh can be run with Cygwin
Reviewed-by: darcy
author | mchung |
---|---|
date | Mon, 08 Aug 2011 16:27:41 -0700 |
parents | 0f1b4b3bc833 |
children | 26fe74aa48ef |
files | test/java/nio/charset/spi/basic.sh |
diffstat | 1 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/nio/charset/spi/basic.sh Mon Aug 08 16:26:25 2011 -0700 +++ b/test/java/nio/charset/spi/basic.sh Mon Aug 08 16:27:41 2011 -0700 @@ -45,9 +45,19 @@ JAVA=$TESTJAVA/bin/java JAR=$TESTJAVA/bin/jar -JARD=`pwd`/x.jar -EXTD=`pwd`/x.ext -TESTD=`pwd`/x.test +DIR=`pwd` +case `uname` in + SunOS | Linux ) CPS=':' ;; + Windows* ) CPS=';' ;; + CYGWIN* ) + DIR=`/usr/bin/cygpath -a -s -m $DIR` + CPS=";";; + *) echo "Unknown platform: `uname`"; exit 1 ;; +esac + +JARD=$DIR/x.jar +EXTD=$DIR/x.ext +TESTD=$DIR/x.test CSS='US-ASCII 8859_1 iso-ir-6 UTF-16 windows-1252 !BAR cp1252' @@ -84,12 +94,6 @@ TMP=${TMP:-$TEMP}; TMP=${TMP:-/tmp} cd $TMP -case `uname` in - SunOS | Linux ) CPS=':' ;; - Windows* ) CPS=';' ;; - *) echo "Unknown platform: `uname`"; exit 1 ;; -esac - failures=0 for where in ext app; do for security in none minimal-policy cp-policy; do