--- old/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Fri Sep  6 09:00:23 2013
+++ new/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Fri Sep  6 09:00:22 2013
@@ -1,7 +1,7 @@
 #!/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
@@ -39,6 +39,13 @@
     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
@@ -64,7 +71,7 @@
 
 
 # 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
@@ -71,17 +78,10 @@
     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
+	    ARCH=sparcv9
 	    ;;
     esac 
 fi