changeset 4920:3802c2440dd2

7141071: TEST_BUG: update shell scripts in java/nio/charset to detect Mac OS as a valid platform Reviewed-by: alanb, michaelm
author michaelm
date Wed, 01 Feb 2012 01:35:46 -0800
parents 611d9bf5b908
children 25c4d6676efa
files test/java/nio/charset/coders/CheckSJISMappingProp.sh test/java/nio/charset/spi/basic.sh
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Tue Jan 31 20:17:45 2012 +0400
+++ b/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Wed Feb 01 01:35:46 2012 -0800
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux ) ;;
+  SunOS | Linux | Darwin ) ;;
   # Skip locale test for Windows
   Windows* )
     echo "Passed"; exit 0 ;;
@@ -67,7 +67,7 @@
   expectPass $?
 }
 
-# Run the test in the common Solaris/Linux locales
+# Run the test in the common Solaris/Linux/Mac OS locales
 # Tests will simply run in current locale if locale isn't supported
 # on the test machine/platform
 
--- a/test/java/nio/charset/spi/basic.sh	Tue Jan 31 20:17:45 2012 +0400
+++ b/test/java/nio/charset/spi/basic.sh	Wed Feb 01 01:35:46 2012 -0800
@@ -70,7 +70,7 @@
     L="$1"
     shift
     s=`uname -s`
-    if [ $s != Linux -a $s != SunOS ]; then
+    if [ $s != Linux -a $s != SunOS -a $s != Darwin ]; then
       echo "$L: Locales not supported on this system, skipping..."
       exit 0
     fi
@@ -85,7 +85,7 @@
 cd $TMP
 
 case `uname` in
-  SunOS | Linux ) CPS=':' ;;
+  SunOS | Linux | Darwin ) CPS=':' ;;
   Windows* )      CPS=';' ;;
   *)              echo "Unknown platform: `uname`"; exit 1 ;;
 esac