changeset 8413:4e4e6c375cb0

8028537: PPC64: Updated the JDK regression tests to run on AIX Reviewed-by: alanb Contributed-by: luchsh@linux.vnet.ibm.com, spoole@linux.vnet.ibm.com, volker.simonis@gmail.com
author simonis
date Mon, 11 Apr 2016 15:45:19 +0100
parents 56a6a45b243c
children 21982fe20d63
files test/ProblemList.txt test/com/sun/corba/5036554/TestCorbaBug.sh test/com/sun/corba/cachedSocket/7056731.sh test/com/sun/jdi/ImmutableResourceTest.sh test/com/sun/jdi/JITDebug.sh test/com/sun/jdi/PrivateTransportTest.sh test/com/sun/jdi/ShellScaffold.sh test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh test/java/io/Serializable/evolution/RenamePackage/run.sh test/java/io/Serializable/serialver/classpath/run.sh test/java/io/Serializable/serialver/nested/run.sh test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh test/java/lang/StringCoding/CheckEncodings.sh test/java/lang/annotation/loaderLeak/LoaderLeak.sh test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh test/java/net/Authenticator/B4933582.sh test/java/net/DatagramSocket/Send12k.java test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh test/java/net/Socket/OldSocketImpl.sh test/java/net/URL/B5086147.sh test/java/net/URLClassLoader/B5077773.sh test/java/net/URLClassLoader/sealing/checksealed.sh test/java/net/URLConnection/6212146/test.sh test/java/nio/charset/coders/CheckSJISMappingProp.sh test/java/nio/charset/spi/basic.sh test/java/nio/file/Files/SBC.java test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh test/java/rmi/registry/readTest/readTest.sh test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh test/java/security/Security/signedfirst/Dyn.sh test/java/security/Security/signedfirst/Static.sh test/java/util/Currency/PropertiesTest.sh test/java/util/Locale/LocaleCategory.sh test/java/util/PluggableLocale/ExecTest.sh test/java/util/ResourceBundle/Bug6299235Test.sh test/java/util/ServiceLoader/basic.sh test/java/util/logging/AnonLoggerWeakRefLeak.sh test/java/util/logging/LoggerWeakRefLeak.sh test/java/util/prefs/CheckUserPrefsStorage.sh test/javax/crypto/SecretKeyFactory/FailOverTest.sh test/javax/imageio/stream/StreamCloserLeak/run_test.sh test/javax/script/CommonSetup.sh test/javax/security/auth/Subject/doAs/Test.sh test/lib/security/java.policy/Ext_AllPolicy.sh test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh test/sun/net/www/http/HttpClient/RetryPost.sh test/sun/net/www/protocol/jar/B5105410.sh test/sun/net/www/protocol/jar/jarbug/run.sh test/sun/rmi/rmic/newrmic/equivalence/batch.sh test/sun/security/krb5/runNameEquals.sh test/sun/security/pkcs11/Provider/ConfigQuotedString.sh test/sun/security/pkcs11/Provider/Login.sh test/sun/security/provider/PolicyFile/getinstance/getinstance.sh test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh test/sun/security/tools/jarsigner/AlgOptions.sh test/sun/security/tools/jarsigner/PercentSign.sh test/sun/security/tools/jarsigner/diffend.sh test/sun/security/tools/jarsigner/oldsig.sh test/sun/security/tools/keytool/AltProviderPath.sh test/sun/security/tools/keytool/CloneKeyAskPassword.sh test/sun/security/tools/keytool/NoExtNPE.sh test/sun/security/tools/keytool/SecretKeyKS.sh test/sun/security/tools/keytool/StandardAlgName.sh test/sun/security/tools/keytool/printssl.sh test/sun/security/tools/keytool/resource.sh test/sun/security/tools/keytool/standard.sh test/sun/security/tools/policytool/Alias.sh test/sun/security/tools/policytool/ChangeUI.sh test/sun/security/tools/policytool/OpenPolicy.sh test/sun/security/tools/policytool/SaveAs.sh test/sun/security/tools/policytool/UpdatePermissions.sh test/sun/security/tools/policytool/UsePolicy.sh test/sun/security/tools/policytool/i18n.sh test/sun/tools/common/CommonSetup.sh test/sun/tools/jconsole/ResourceCheckTest.sh test/sun/tools/jinfo/Basic.sh test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh test/tools/launcher/ExecutionEnvironment.java test/tools/launcher/Settings.java test/tools/launcher/TestHelper.java
diffstat 89 files changed, 210 insertions(+), 90 deletions(-) [+]
line wrap: on
line diff
--- a/test/ProblemList.txt	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/ProblemList.txt	Mon Apr 11 15:45:19 2016 +0100
@@ -43,11 +43,11 @@
 #
 # List items  are testnames followed by labels, all MUST BE commented
 #   as to why they are here and use a label:
-#     generic-all       Problems on all platforms
-#     generic-ARCH      Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
-#     OSNAME-all        Where OSNAME is one of: solaris, linux, windows
-#     OSNAME-ARCH       Specific on to one OSNAME and ARCH, e.g. solaris-x64
-#     OSNAME-REV        Specific on to one OSNAME and REV, e.g. solaris-5.8
+#     generic-all   Problems on all platforms
+#     generic-ARCH  Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
+#     OSNAME-all    Where OSNAME is one of: solaris, linux, windows, macosx, aix
+#     OSNAME-ARCH   Specific on to one OSNAME and ARCH, e.g. solaris-amd64
+#     OSNAME-REV    Specific on to one OSNAME and REV, e.g. solaris-5.8
 #
 # More than one label is allowed but must be on the same line.
 #
@@ -221,6 +221,11 @@
 # Windows i586 failure, callback did not complete
 javax/management/eventService/LeaseManagerDeadlockTest.java     windows-all
 
+# 8030957
+com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java aix-all
+com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  aix-all
+javax/management/MBeanServer/OldMBeanServerTest.java            aix-all
+
 ############################################################################
 
 # jdk_math
--- a/test/com/sun/corba/5036554/TestCorbaBug.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/corba/5036554/TestCorbaBug.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -48,7 +48,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/com/sun/corba/cachedSocket/7056731.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/corba/cachedSocket/7056731.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/com/sun/jdi/ImmutableResourceTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/jdi/ImmutableResourceTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -56,7 +56,7 @@
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       ;;
 
--- a/test/com/sun/jdi/JITDebug.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/jdi/JITDebug.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -63,7 +63,7 @@
 OS=`uname -s`
 export TRANSPORT_METHOD
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       TRANSPORT_METHOD=dt_socket
       ;;
--- a/test/com/sun/jdi/PrivateTransportTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/jdi/PrivateTransportTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -123,7 +123,7 @@
     esac
     libloc=${jreloc}/lib/${libarch}
     ;;
-  Linux)
+  Linux|AIX)
     xx=`find ${jreloc}/lib -name libdt_socket.so`
     libloc=`dirname ${xx}`
     ;;
@@ -182,13 +182,23 @@
     echo cp ${libloc}/libdt_socket.so ${fullpath}
     cp ${libloc}/libdt_socket.so ${fullpath}
     # make sure we can find libraries in current directory
-    if [ "${LD_LIBRARY_PATH}" = "" ] ; then
-        LD_LIBRARY_PATH=${libdir}
+    if [ "$os" = "AIX" ] ; then
+        if [ "${LIBPATH}" = "" ] ; then
+            LIBPATH=${libdir}
+        else
+            LIBPATH=${LIBPATH}:${libdir}
+        fi
+        export LIBPATH
+        echo LIBPATH=${LIBPATH}
     else
-        LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libdir}
+        if [ "${LD_LIBRARY_PATH}" = "" ] ; then
+            LD_LIBRARY_PATH=${libdir}
+        else
+            LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libdir}
+        fi
+        export LD_LIBRARY_PATH
+        echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
     fi
-    export LD_LIBRARY_PATH
-    echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 else 
     echo "cannot find dt_socket in ${libloc} for ${private_transport}"
     fail "cannot find dt_socket in ${libloc} for ${private_transport}"
--- a/test/com/sun/jdi/ShellScaffold.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/jdi/ShellScaffold.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -199,6 +199,8 @@
         if [ "$osname" = SunOS ] ; then
             # Solaris and OpenSolaris use pgrep and not ps in psCmd
             findPidCmd="$psCmd"
+        elif [ "$osname" = AIX ] ; then
+            findPidCmd="$psCmd"
         else
             #   Never use plain 'ps', which requires a "controlling terminal"
             #     and will fail  with a "ps: no controlling terminal" error.
@@ -293,7 +295,7 @@
          psCmd=ps
          jstack=jstack.exe
          ;;
-       SunOS | Linux | Darwin)
+       SunOS | Linux | Darwin | AIX)
          transport=dt_socket
          address=
          devnull=/dev/null
--- a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -45,7 +45,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN*)
--- a/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -102,6 +102,14 @@
       TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
       ;;
 
+   AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    # catch all other OSs
    * )
       echo "Unrecognized system!  $OS"
--- a/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -137,6 +137,14 @@
       TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
       ;;
 
+    AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    # catch all other OSs
    * )
       echo "Unrecognized system!  $OS"
--- a/test/java/io/Serializable/evolution/RenamePackage/run.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/io/Serializable/evolution/RenamePackage/run.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -41,7 +41,7 @@
 # Need to determine the classpath separator and filepath separator based on the
 # operating system.
 case "$OS" in
-SunOS | Linux | Darwin )
+SunOS | Linux | Darwin | AIX )
   PS=":"  ;;
 Windows* | CYGWIN* )
   PS=";"  ;;
--- a/test/java/io/Serializable/serialver/classpath/run.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/io/Serializable/serialver/classpath/run.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"    ;;
   Windows* | CYGWIN* )
     PS=";"    ;;
--- a/test/java/io/Serializable/serialver/nested/run.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/io/Serializable/serialver/nested/run.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"    ;;
   Windows* | CYGWIN* )
     PS=";"    ;;
--- a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -54,6 +54,9 @@
   Darwin )
     FS="/"
     ;;
+  AIX )
+    FS="/"
+    ;;
   Windows*)
     FS="\\"
     ;;
--- a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -58,6 +58,9 @@
   Darwin )
     FS="/"
     ;;
+  AIX )
+    FS="/"
+    ;;
   Windows* | CYGWIN* )
     FS="\\"
     ;;
--- a/test/java/lang/StringCoding/CheckEncodings.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/lang/StringCoding/CheckEncodings.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -30,7 +30,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin) ;;
+  SunOS | Linux | Darwin | AIX ) ;;
   Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
   * ) echo "Unrecognized system!" ;  exit 1 ;;
--- a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -44,7 +44,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin)
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -47,6 +47,10 @@
     PS=":"
     FS="/"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    ;;
   Windows*)
     PS=";"
     OS="Windows"
--- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -61,7 +61,7 @@
 while true; do
   echo "Run $i: TestSystemLoadAvg"
   case `uname -s` in
-       SunOS | Linux | Darwin )
+       SunOS | Linux | Darwin | AIX )
          runOne GetSystemLoadAverage
          ;;
       * )
--- a/test/java/net/Authenticator/B4933582.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/Authenticator/B4933582.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/net/DatagramSocket/Send12k.java	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/DatagramSocket/Send12k.java	Mon Apr 11 15:45:19 2016 +0100
@@ -53,7 +53,7 @@
         boolean sendOkay = true;
         try {
             s1.send(p1);
-        } catch (SocketException e) {
+        } catch (IOException e) {
             /*
              * Prior to merlin a send of > 12k to loopback address
              * would fail silently.
--- a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -27,7 +27,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- a/test/java/net/Socket/OldSocketImpl.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/Socket/OldSocketImpl.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/net/URL/B5086147.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/URL/B5086147.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     exit 0
     ;;
   CYGWIN* )
--- a/test/java/net/URLClassLoader/B5077773.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/URLClassLoader/B5077773.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/net/URLClassLoader/sealing/checksealed.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/URLClassLoader/sealing/checksealed.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -27,7 +27,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/net/URLConnection/6212146/test.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/net/URLConnection/6212146/test.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin ) ;;
+  SunOS | Linux | Darwin | AIX ) ;;
   # Skip locale test for Windows
   Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
--- a/test/java/nio/charset/spi/basic.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/nio/charset/spi/basic.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -70,7 +70,7 @@
     L="$1"
     shift
     s=`uname -s`
-    if [ $s != Linux -a $s != SunOS -a $s != Darwin ]; then
+    if [ $s != Linux -a $s != SunOS -a $s != Darwin -a $s != AIX ]; then
       echo "$L: Locales not supported on this system, skipping..."
       exit 0
     fi
@@ -85,7 +85,7 @@
 cd $TMP
 
 case `uname` in
-  SunOS | Linux | Darwin ) CPS=':' ;;
+  SunOS | Linux | Darwin | AIX ) CPS=':' ;;
   Windows* )      CPS=';' ;;
   *)              echo "Unknown platform: `uname`"; exit 1 ;;
 esac
--- a/test/java/nio/file/Files/SBC.java	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/nio/file/Files/SBC.java	Mon Apr 11 15:45:19 2016 +0100
@@ -235,7 +235,7 @@
             try {
                 Files.newByteChannel(link, READ, LinkOption.NOFOLLOW_LINKS);
                 throw new RuntimeException();
-            } catch (IOException x) {
+            } catch (IOException | UnsupportedOperationException x) {
             } finally {
                 TestUtil.deleteUnchecked(link);
             }
--- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN* )
--- a/test/java/rmi/registry/readTest/readTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/rmi/registry/readTest/readTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -34,7 +34,7 @@
 REGARGS=""
 
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     CHMOD="${FS}bin${FS}chmod"
--- a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -58,6 +58,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,6 +46,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -66,6 +66,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
--- a/test/java/security/Security/signedfirst/Dyn.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/security/Security/signedfirst/Dyn.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -58,6 +58,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
--- a/test/java/security/Security/signedfirst/Static.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/security/Security/signedfirst/Static.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -58,6 +58,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
--- a/test/java/util/Currency/PropertiesTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/Currency/PropertiesTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -30,7 +30,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/util/Locale/LocaleCategory.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/Locale/LocaleCategory.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -30,7 +30,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/util/PluggableLocale/ExecTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/PluggableLocale/ExecTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -58,7 +58,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/java/util/ResourceBundle/Bug6299235Test.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/ResourceBundle/Bug6299235Test.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -31,7 +31,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- a/test/java/util/ServiceLoader/basic.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/ServiceLoader/basic.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -42,7 +42,7 @@
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Darwin )
+    SunOS | Darwin | AIX )
       SEP=':' ;;
     Linux )
       SEP=':' ;;
--- a/test/java/util/logging/AnonLoggerWeakRefLeak.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/logging/AnonLoggerWeakRefLeak.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -83,9 +83,9 @@
     fi
 
     if [ "$status" != 0 ]; then
-        echo "ERROR: 'jmap $jmap_option' is not supported so this test"
-        echo "ERROR: cannot work reliably. Aborting!"
-        exit 2
+        echo "WARNING: 'jmap $jmap_option' is not supported on this platform"
+        echo "WARNING: so this test cannot work reliably. Aborting!"
+        exit 0
     fi
 fi
 
--- a/test/java/util/logging/LoggerWeakRefLeak.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/logging/LoggerWeakRefLeak.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -83,9 +83,9 @@
     fi
 
     if [ "$status" != 0 ]; then
-        echo "ERROR: 'jmap $jmap_option' is not supported so this test"
-        echo "ERROR: cannot work reliably. Aborting!"
-        exit 2
+        echo "WARNING: 'jmap $jmap_option' is not supported on this platform"
+        echo "WARNING: so this test cannot work reliably. Aborting!"
+        exit 0
     fi
 fi
 
--- a/test/java/util/prefs/CheckUserPrefsStorage.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/java/util/prefs/CheckUserPrefsStorage.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -51,7 +51,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -92,6 +92,14 @@
       TMP="/tmp"
       ;;
 
+   AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    Darwin )
       VAR="A different value for MacOSX"
       DEFAULT_JDK=/usr
--- a/test/javax/script/CommonSetup.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/javax/script/CommonSetup.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -36,7 +36,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/javax/security/auth/Subject/doAs/Test.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/javax/security/auth/Subject/doAs/Test.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -48,6 +48,11 @@
     FS="/"
     RM="/bin/rm -f"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    RM="/bin/rm -f"
+    ;;
   CYGWIN* )
     PS=";"
     FS="/"
--- a/test/lib/security/java.policy/Ext_AllPolicy.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/lib/security/java.policy/Ext_AllPolicy.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -50,7 +50,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -35,7 +35,7 @@
 UMASK=`umask`
 
 case $OS in
-SunOS | Linux | Darwin)
+SunOS | Linux | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     DFILESEP=$FILESEP
--- a/test/sun/net/www/http/HttpClient/RetryPost.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/net/www/http/HttpClient/RetryPost.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/sun/net/www/protocol/jar/B5105410.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/net/www/protocol/jar/B5105410.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/sun/net/www/protocol/jar/jarbug/run.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/net/www/protocol/jar/jarbug/run.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     CHMOD="${FS}bin${FS}chmod"
--- a/test/sun/rmi/rmic/newrmic/equivalence/batch.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/rmi/rmic/newrmic/equivalence/batch.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -61,13 +61,13 @@
 
 set -ex
 
-${TESTJAVA}/bin/rmic -keep -nowrite -v1.1 -d $refv11dir -classpath "$@"
-${TESTJAVA}/bin/rmic -keep -nowrite -vcompat -d $refvcompatdir -classpath "$@"
-${TESTJAVA}/bin/rmic -keep -v1.2 -d $refv12dir -classpath "$@"
+${TESTJAVA}/bin/rmic       -keep -nowrite -v1.1 -d $refv11dir -classpath "$@"
+${TESTJAVA}/bin/rmic       -keep -nowrite -vcompat -d $refvcompatdir -classpath "$@"
+${TESTJAVA}/bin/rmic       -keep -nowrite -v1.2 -d $refv12dir -classpath "$@"
 
-${TESTJAVA}/bin/rmic -Xnew -nowrite -keep -v1.1 -d $newv11dir -classpath "$@"
-${TESTJAVA}/bin/rmic -Xnew -nowrite -keep -vcompat -d $newvcompatdir -classpath "$@"
-${TESTJAVA}/bin/rmic -Xnew -keep -v1.2 -d $newv12dir -classpath "$@"
+${TESTJAVA}/bin/rmic -Xnew -keep -nowrite -v1.1 -d $newv11dir -classpath "$@"
+${TESTJAVA}/bin/rmic -Xnew -keep -nowrite -vcompat -d $newvcompatdir -classpath "$@"
+${TESTJAVA}/bin/rmic -Xnew -keep -nowrite -v1.2 -d $newv12dir -classpath "$@"
 
 set +ex
 
--- a/test/sun/security/krb5/runNameEquals.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/krb5/runNameEquals.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -57,6 +57,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
--- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -68,6 +68,12 @@
     CP="${FS}bin${FS}cp"
     CHMOD="${FS}bin${FS}chmod"
     ;;
+  AIX )
+    FS="/"
+    PS=":"
+    CP="${FS}bin${FS}cp"
+    CHMOD="${FS}bin${FS}chmod"
+    ;;
   Windows* )
     FS="\\"
     PS=";"
--- a/test/sun/security/pkcs11/Provider/Login.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/pkcs11/Provider/Login.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -69,6 +69,12 @@
     CP="${FS}bin${FS}cp"
     CHMOD="${FS}bin${FS}chmod"
     ;;
+  AIX )
+    FS="/"
+    PS=":"
+    CP="${FS}bin${FS}cp"
+    CHMOD="${FS}bin${FS}chmod"
+    ;;
   Windows* )
     FS="\\"
     PS=";"
--- a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -59,6 +59,10 @@
     PS=":"
     FS="/"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    ;;
   CYGWIN* )
     PS=";"
     FS="/"
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -42,7 +42,7 @@
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Linux | Darwin )
+    SunOS | Linux | Darwin | AIX )
         FILESEP="/"
         PATHSEP=":"
         ;;
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- a/test/sun/security/tools/jarsigner/AlgOptions.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/jarsigner/AlgOptions.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/jarsigner/PercentSign.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/jarsigner/PercentSign.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/jarsigner/diffend.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/jarsigner/diffend.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -41,7 +41,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/jarsigner/oldsig.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/jarsigner/oldsig.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -42,7 +42,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/keytool/AltProviderPath.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/AltProviderPath.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -59,6 +59,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
--- a/test/sun/security/tools/keytool/NoExtNPE.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/NoExtNPE.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -51,6 +51,10 @@
   Darwin )
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     FILESEP="/"
     ;;
--- a/test/sun/security/tools/keytool/SecretKeyKS.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/SecretKeyKS.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -45,7 +45,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/keytool/StandardAlgName.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/StandardAlgName.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/keytool/printssl.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/printssl.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -37,7 +37,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     FS="/"
     ;;
   CYGWIN* )
--- a/test/sun/security/tools/keytool/resource.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/resource.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -43,7 +43,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     FS="/"
     ;;
--- a/test/sun/security/tools/keytool/standard.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/keytool/standard.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -44,7 +44,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | Darwin | AIX | CYGWIN* )
     FS="/"
     ;;
   Windows_* )
--- a/test/sun/security/tools/policytool/Alias.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/Alias.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/policytool/ChangeUI.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/ChangeUI.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/policytool/OpenPolicy.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/OpenPolicy.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/policytool/SaveAs.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/SaveAs.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/policytool/UpdatePermissions.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/UpdatePermissions.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/policytool/UsePolicy.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/UsePolicy.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/security/tools/policytool/i18n.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/security/tools/policytool/i18n.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- a/test/sun/tools/common/CommonSetup.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/tools/common/CommonSetup.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -47,6 +47,7 @@
 #   isLinux   - true if OS is Linux
 #   isSolaris - true if OS is Solaris
 #   isWindows - true if OS is Windows
+#   isAIX     - true if OS is AIX
 
 
 if [ -z "${TESTJAVA}" ]; then
@@ -81,6 +82,7 @@
 isSolaris=false
 isUnknownOS=false
 isWindows=false
+isAIX=false
 
 OS=`uname -s`
 
@@ -107,6 +109,10 @@
     OS="Solaris"
     isSolaris=true
     ;;
+  AIX )
+    OS="AIX"
+    isAIX=true
+    ;;
   Windows* )
     OS="Windows"
     PATTERN_EOL='[
]*$'
--- a/test/sun/tools/jconsole/ResourceCheckTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/tools/jconsole/ResourceCheckTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -54,7 +54,7 @@
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin)
+   SunOS | Linux | Darwin | AIX)
       PATHSEP=":"
       ;;
 
--- a/test/sun/tools/jinfo/Basic.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/tools/jinfo/Basic.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -45,7 +45,9 @@
 failed=0
 
 # Skip SA options for now, see 7175133
-runSA=false
+if [ $isMacos = true -o $isAIX = true -o `uname -m` = ppc64 ]; then
+    runSA=false
+fi
 
 if [ $isLinux = true ]; then
     # Some Linux systems disable non-child ptrace (see 7050524)
--- a/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Mon Apr 11 15:45:19 2016 +0100
@@ -56,7 +56,7 @@
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       ;;
 
--- a/test/tools/launcher/ExecutionEnvironment.java	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/tools/launcher/ExecutionEnvironment.java	Mon Apr 11 15:45:19 2016 +0100
@@ -63,7 +63,9 @@
 public class ExecutionEnvironment {
     static final String LD_LIBRARY_PATH    = TestHelper.isMacOSX
             ? "DYLD_LIBRARY_PATH"
-            : "LD_LIBRARY_PATH";
+            : TestHelper.isAIX
+                    ? "LIBPATH"
+                    : "LD_LIBRARY_PATH";
     static final String LD_LIBRARY_PATH_32 = LD_LIBRARY_PATH + "_32";
     static final String LD_LIBRARY_PATH_64 = LD_LIBRARY_PATH + "_64";
 
@@ -184,7 +186,7 @@
 
         Map<String, String> env = new HashMap<String, String>();
 
-        if (TestHelper.isLinux || TestHelper.isMacOSX) {
+        if (TestHelper.isLinux || TestHelper.isMacOSX || TestHelper.isAIX) {
             for (String x : LD_PATH_STRINGS) {
                 String pairs[] = x.split("=");
                 env.put(pairs[0], pairs[1]);
--- a/test/tools/launcher/Settings.java	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/tools/launcher/Settings.java	Mon Apr 11 15:45:19 2016 +0100
@@ -73,16 +73,20 @@
     }
 
     static void runTestOptionDefault() throws IOException {
+        String stackSize = "256"; // in kb
+        if (getArch().equals("ppc64")) {
+            stackSize = "800";
+        }
         TestHelper.TestResult tr = null;
         tr = TestHelper.doExec(TestHelper.javaCmd, "-Xms64m", "-Xmx512m",
-                "-Xss256k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+                "-Xss" + stackSize + "k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
         containsAllOptions(tr);
         if (!tr.isOK()) {
             System.out.println(tr.status);
             throw new RuntimeException("test fails");
         }
         tr = TestHelper.doExec(TestHelper.javaCmd, "-Xms65536k", "-Xmx712m",
-                "-Xss256000", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+                "-Xss" + stackSize + "000", "-XshowSettings", "-jar", testJar.getAbsolutePath());
         containsAllOptions(tr);
         if (!tr.isOK()) {
             System.out.println(tr.status);
--- a/test/tools/launcher/TestHelper.java	Fri Nov 01 15:10:10 2013 +0100
+++ b/test/tools/launcher/TestHelper.java	Mon Apr 11 15:45:19 2016 +0100
@@ -86,6 +86,8 @@
             System.getProperty("os.name", "unknown").startsWith("SunOS");
     static final boolean isLinux =
             System.getProperty("os.name", "unknown").startsWith("Linux");
+    static final boolean isAIX =
+            System.getProperty("os.name", "unknown").startsWith("AIX");
     static final boolean isDualMode = isSolaris;
     static final boolean isSparc = System.getProperty("os.arch").startsWith("sparc");