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

*** 1,9 ****
  #!/bin/sh
  
  #
! # Copyright (c) 2003, 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.
--- 1,9 ----
  #!/bin/sh
  
  #
! # 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.
*** 21,31 ****
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
- 
  # @test
  # @bug 4673940
  # @bug 4930794
  # @summary Unit tests for inetd feature
  #
--- 21,30 ----
*** 37,47 ****
  if [ "$os" != "Linux" -a "$os" != "SunOS" ]; then
      echo "Test not designed to run on this operating system, skipping..."
      exit 0
  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'.
  
  if [ -z "$TESTJAVA" ]; then
--- 36,45 ----
*** 62,89 ****
  CLASSPATH=${TESTCLASSES}
  export CLASSPATH
  
  
  # Check that we have libLauncher.so for the right platform.
! # On Solaris we assume 64-bit if java -d64 works.
  
  DFLAG=
  if [ "$os" = "SunOS" ]; then
      PLATFORM=solaris
      case "`uname -p`" in
          i[3-9]86) 
!             ARCH=i586
              ;;
          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
--- 60,80 ----
  CLASSPATH=${TESTCLASSES}
  export CLASSPATH
  
  
  # Check that we have libLauncher.so for the right platform.
! # On Solaris we assume 64-bit
  
  DFLAG=
  if [ "$os" = "SunOS" ]; then
      PLATFORM=solaris
      case "`uname -p`" in
          i[3-9]86) 
!             ARCH=amd64
              ;;
          sparc)
              ARCH=sparcv9
              ;;
      esac 
  fi
  
  if [ "$os" = "Linux" ]; then