test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.

@@ -37,10 +37,17 @@
 if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
     echo "Test not designed to run on this operating system, skipping..."
     exit 0
 fi
 
+arch=`uname -p`
+if [ "$os" = "SunOS" ]; then
+    if [ "$arch" = "i386"  -o "$arch" = "sparc" ]; then
+        echo "Test not designed to run on this operating system, skipping..."
+        exit 0
+    fi
+fi
 
 # if TESTJAVA isn't set then we assume an interactive run. So that it's
 # clear which version of 'java' is running we do a 'which java' and
 # a 'java -version'.
 

@@ -62,28 +69,21 @@
 CLASSPATH=${TESTCLASSES}
 export CLASSPATH
 
 
 # Check that we have libLauncher.so for the right platform.
-# On Solaris we assume 64-bit if java -d64 works.
+# On Solaris we assume 64-bit
 
 DFLAG=
 if [ "$os" = "SunOS" ]; then
     PLATFORM=solaris
     case "`uname -p`" in
         i[3-9]86) 
-            ARCH=i586
+            ARCH=amd64
             ;;
         sparc)
-            ARCH=sparc
-            ${JAVA} -d64 -version > /dev/null 2<&1 
-            if [ $? = 1 ]; then
-                ARCH=sparc
-            else
                 ARCH=sparcv9
-                DFLAG=-d64
-            fi
             ;;
     esac 
 fi
 
 if [ "$os" = "Linux" ]; then