# HG changeset patch
# User simonis
# Date 1389992070 -3600
# Node ID f04b825b1c0c91420f1d8a3a2cd55ef078186035
# Parent  c1e75d17b9931386539ffee166b4da0307881b04
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

diff --git a/test/ProblemList.txt b/test/ProblemList.txt
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -41,11 +41,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, macosx
-#     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
+#     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.
 #
@@ -134,6 +134,11 @@
 
 # jdk_jmx
 
+# 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
diff --git a/test/com/sun/corba/5036554/TestCorbaBug.sh b/test/com/sun/corba/5036554/TestCorbaBug.sh
--- a/test/com/sun/corba/5036554/TestCorbaBug.sh
+++ b/test/com/sun/corba/5036554/TestCorbaBug.sh
@@ -48,7 +48,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/com/sun/corba/cachedSocket/7056731.sh b/test/com/sun/corba/cachedSocket/7056731.sh
--- a/test/com/sun/corba/cachedSocket/7056731.sh
+++ b/test/com/sun/corba/cachedSocket/7056731.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java b/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
--- a/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
+++ b/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
@@ -25,7 +25,7 @@
  * @bug 8016551
  * @summary JMenuItem in WindowsLookAndFeel can't paint default icons
  * @author Leonid Romanov
- * @run main bug8016551
+ * @run main/othervm bug8016551
  */
 
 import javax.swing.*;
diff --git a/test/com/sun/jdi/ImmutableResourceTest.sh b/test/com/sun/jdi/ImmutableResourceTest.sh
--- a/test/com/sun/jdi/ImmutableResourceTest.sh
+++ b/test/com/sun/jdi/ImmutableResourceTest.sh
@@ -56,7 +56,7 @@
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       ;;
 
diff --git a/test/com/sun/jdi/JITDebug.sh b/test/com/sun/jdi/JITDebug.sh
--- a/test/com/sun/jdi/JITDebug.sh
+++ b/test/com/sun/jdi/JITDebug.sh
@@ -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
       ;;
diff --git a/test/com/sun/jdi/PrivateTransportTest.sh b/test/com/sun/jdi/PrivateTransportTest.sh
--- a/test/com/sun/jdi/PrivateTransportTest.sh
+++ b/test/com/sun/jdi/PrivateTransportTest.sh
@@ -102,7 +102,7 @@
 is_windows=false
 is_cygwin=false
 case `uname -s` in 
-  SunOS|Linux)
+  SunOS|Linux|AIX)
     xx=`find ${jreloc}/lib -name libdt_socket.so`
     libloc=`dirname ${xx}`
     ;;
@@ -161,13 +161,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}"
diff --git a/test/com/sun/jdi/ShellScaffold.sh b/test/com/sun/jdi/ShellScaffold.sh
--- a/test/com/sun/jdi/ShellScaffold.sh
+++ b/test/com/sun/jdi/ShellScaffold.sh
@@ -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
diff --git a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
--- a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
+++ b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
@@ -45,7 +45,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN*)
diff --git a/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh b/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
--- a/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
+++ b/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
@@ -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"
diff --git a/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
--- a/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
+++ b/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -135,6 +135,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"
diff --git a/test/java/io/Serializable/evolution/RenamePackage/run.sh b/test/java/io/Serializable/evolution/RenamePackage/run.sh
--- a/test/java/io/Serializable/evolution/RenamePackage/run.sh
+++ b/test/java/io/Serializable/evolution/RenamePackage/run.sh
@@ -45,7 +45,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=";"  ;;
diff --git a/test/java/io/Serializable/serialver/classpath/run.sh b/test/java/io/Serializable/serialver/classpath/run.sh
--- a/test/java/io/Serializable/serialver/classpath/run.sh
+++ b/test/java/io/Serializable/serialver/classpath/run.sh
@@ -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=";"    ;;
diff --git a/test/java/io/Serializable/serialver/nested/run.sh b/test/java/io/Serializable/serialver/nested/run.sh
--- a/test/java/io/Serializable/serialver/nested/run.sh
+++ b/test/java/io/Serializable/serialver/nested/run.sh
@@ -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=";"    ;;
diff --git a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
--- a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
+++ b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
@@ -58,6 +58,9 @@
   Darwin )
     FS="/"
     ;;
+  AIX )
+    FS="/"
+    ;;
   Windows*)
     FS="\\"
     ;;
diff --git a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
--- a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
+++ b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
@@ -63,6 +63,9 @@
   Darwin )
     FS="/"
     ;;
+  AIX )
+    FS="/"
+    ;;
   Windows* | CYGWIN* )
     FS="\\"
     ;;
diff --git a/test/java/lang/StringCoding/CheckEncodings.sh b/test/java/lang/StringCoding/CheckEncodings.sh
--- a/test/java/lang/StringCoding/CheckEncodings.sh
+++ b/test/java/lang/StringCoding/CheckEncodings.sh
@@ -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 ;;
diff --git a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
--- a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
+++ b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
@@ -48,7 +48,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin)
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh b/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
--- a/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
@@ -47,6 +47,10 @@
     PS=":"
     FS="/"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    ;;
   Windows*)
     PS=";"
     OS="Windows"
diff --git a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
--- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
+++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
@@ -61,7 +61,7 @@
 while true; do
   echo "Run $i: TestSystemLoadAvg"
   case `uname -s` in
-       SunOS | Linux | Darwin )
+       SunOS | Linux | Darwin | AIX )
          runOne GetSystemLoadAverage
          ;;
       * )
diff --git a/test/java/net/Authenticator/B4933582.sh b/test/java/net/Authenticator/B4933582.sh
--- a/test/java/net/Authenticator/B4933582.sh
+++ b/test/java/net/Authenticator/B4933582.sh
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/DatagramSocket/Send12k.java b/test/java/net/DatagramSocket/Send12k.java
--- a/test/java/net/DatagramSocket/Send12k.java
+++ b/test/java/net/DatagramSocket/Send12k.java
@@ -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.
diff --git a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
--- a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
+++ b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
@@ -27,7 +27,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
diff --git a/test/java/net/Socket/OldSocketImpl.sh b/test/java/net/Socket/OldSocketImpl.sh
--- a/test/java/net/Socket/OldSocketImpl.sh
+++ b/test/java/net/Socket/OldSocketImpl.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/URL/B5086147.sh b/test/java/net/URL/B5086147.sh
--- a/test/java/net/URL/B5086147.sh
+++ b/test/java/net/URL/B5086147.sh
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     exit 0
     ;;
   CYGWIN* )
diff --git a/test/java/net/URLClassLoader/B5077773.sh b/test/java/net/URLClassLoader/B5077773.sh
--- a/test/java/net/URLClassLoader/B5077773.sh
+++ b/test/java/net/URLClassLoader/B5077773.sh
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/URLClassLoader/sealing/checksealed.sh b/test/java/net/URLClassLoader/sealing/checksealed.sh
--- a/test/java/net/URLClassLoader/sealing/checksealed.sh
+++ b/test/java/net/URLClassLoader/sealing/checksealed.sh
@@ -27,7 +27,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/URLConnection/6212146/test.sh b/test/java/net/URLConnection/6212146/test.sh
--- a/test/java/net/URLConnection/6212146/test.sh
+++ b/test/java/net/URLConnection/6212146/test.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/nio/charset/coders/CheckSJISMappingProp.sh b/test/java/nio/charset/coders/CheckSJISMappingProp.sh
--- a/test/java/nio/charset/coders/CheckSJISMappingProp.sh
+++ b/test/java/nio/charset/coders/CheckSJISMappingProp.sh
@@ -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 ;;
diff --git a/test/java/nio/charset/spi/basic.sh b/test/java/nio/charset/spi/basic.sh
--- a/test/java/nio/charset/spi/basic.sh
+++ b/test/java/nio/charset/spi/basic.sh
@@ -48,7 +48,7 @@
 
 DIR=`pwd`
 case `uname` in
-  SunOS | Linux | Darwin ) CPS=':' ;;
+  SunOS | Linux | Darwin | AIX ) CPS=':' ;;
   Windows* )      CPS=';' ;;
   CYGWIN*  )
     DIR=`/usr/bin/cygpath -a -s -m $DIR`
@@ -81,7 +81,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
diff --git a/test/java/nio/file/Files/SBC.java b/test/java/nio/file/Files/SBC.java
--- a/test/java/nio/file/Files/SBC.java
+++ b/test/java/nio/file/Files/SBC.java
@@ -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);
             }
diff --git a/test/java/nio/file/Files/walkFileTree/find.sh b/test/java/nio/file/Files/walkFileTree/find.sh
--- a/test/java/nio/file/Files/walkFileTree/find.sh
+++ b/test/java/nio/file/Files/walkFileTree/find.sh
@@ -43,7 +43,14 @@
         echo "This test does not run on Windows" 
         exit 0
         ;;
+    AIX )
+        CLASSPATH=${TESTCLASSES}:${TESTSRC}
+        # On AIX "find -follow" may core dump on recursive links without '-L'
+        # see: http://www-01.ibm.com/support/docview.wss?uid=isg1IV28143
+        FIND_FOLLOW_OPT="-L"
+        ;;
     * )
+        FIND_FOLLOW_OPT=
         CLASSPATH=${TESTCLASSES}:${TESTSRC}
         ;;
 esac
@@ -65,7 +72,7 @@
 # cycles (sym links to ancestor directories), other versions do
 # not. For that reason we run PrintFileTree with the -printCycles
 # option when the output without this option differs to find(1).
-find "$ROOT" -follow > out1
+find $FIND_FOLLOW_OPT "$ROOT" -follow > out1
 $JAVA ${TESTVMOPTS} PrintFileTree -follow "$ROOT" > out2
 diff out1 out2
 if [ $? != 0 ];
diff --git a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
--- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
+++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN* )
diff --git a/test/java/rmi/registry/readTest/readTest.sh b/test/java/rmi/registry/readTest/readTest.sh
--- a/test/java/rmi/registry/readTest/readTest.sh
+++ b/test/java/rmi/registry/readTest/readTest.sh
@@ -30,7 +30,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     FILEURL="file:"
diff --git a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
--- a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
@@ -62,6 +62,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
@@ -46,6 +46,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
@@ -70,6 +70,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
diff --git a/test/java/security/Security/signedfirst/Dyn.sh b/test/java/security/Security/signedfirst/Dyn.sh
--- a/test/java/security/Security/signedfirst/Dyn.sh
+++ b/test/java/security/Security/signedfirst/Dyn.sh
@@ -62,6 +62,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/security/Security/signedfirst/Static.sh b/test/java/security/Security/signedfirst/Static.sh
--- a/test/java/security/Security/signedfirst/Static.sh
+++ b/test/java/security/Security/signedfirst/Static.sh
@@ -62,6 +62,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/util/Currency/PropertiesTest.sh b/test/java/util/Currency/PropertiesTest.sh
--- a/test/java/util/Currency/PropertiesTest.sh
+++ b/test/java/util/Currency/PropertiesTest.sh
@@ -52,7 +52,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/Locale/LocaleCategory.sh b/test/java/util/Locale/LocaleCategory.sh
--- a/test/java/util/Locale/LocaleCategory.sh
+++ b/test/java/util/Locale/LocaleCategory.sh
@@ -52,7 +52,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/Locale/LocaleProviders.sh b/test/java/util/Locale/LocaleProviders.sh
--- a/test/java/util/Locale/LocaleProviders.sh
+++ b/test/java/util/Locale/LocaleProviders.sh
@@ -56,7 +56,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/PluggableLocale/ExecTest.sh b/test/java/util/PluggableLocale/ExecTest.sh
--- a/test/java/util/PluggableLocale/ExecTest.sh
+++ b/test/java/util/PluggableLocale/ExecTest.sh
@@ -62,7 +62,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/ResourceBundle/Bug6299235Test.sh b/test/java/util/ResourceBundle/Bug6299235Test.sh
--- a/test/java/util/ResourceBundle/Bug6299235Test.sh
+++ b/test/java/util/ResourceBundle/Bug6299235Test.sh
@@ -31,7 +31,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
diff --git a/test/java/util/ServiceLoader/basic.sh b/test/java/util/ServiceLoader/basic.sh
--- a/test/java/util/ServiceLoader/basic.sh
+++ b/test/java/util/ServiceLoader/basic.sh
@@ -43,7 +43,7 @@
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Darwin )
+    SunOS | Darwin | AIX )
       SEP=':' ;;
     Linux )
       SEP=':' ;;
diff --git a/test/java/util/logging/AnonLoggerWeakRefLeak.sh b/test/java/util/logging/AnonLoggerWeakRefLeak.sh
--- a/test/java/util/logging/AnonLoggerWeakRefLeak.sh
+++ b/test/java/util/logging/AnonLoggerWeakRefLeak.sh
@@ -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
 
diff --git a/test/java/util/logging/LoggerWeakRefLeak.sh b/test/java/util/logging/LoggerWeakRefLeak.sh
--- a/test/java/util/logging/LoggerWeakRefLeak.sh
+++ b/test/java/util/logging/LoggerWeakRefLeak.sh
@@ -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
 
diff --git a/test/java/util/prefs/CheckUserPrefsStorage.sh b/test/java/util/prefs/CheckUserPrefsStorage.sh
--- a/test/java/util/prefs/CheckUserPrefsStorage.sh
+++ b/test/java/util/prefs/CheckUserPrefsStorage.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
--- a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
+++ b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
@@ -56,7 +56,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
--- a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
+++ b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
@@ -89,7 +89,7 @@
       FILESEP="/"
       ;;
 
-   Linux | Darwin  )
+   Linux | Darwin | AIX )
       VAR="A different value for Linux"
       DEFAULT_JDK=/none
       #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
diff --git a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
--- a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
+++ b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
@@ -90,7 +90,7 @@
       FILESEP="/"
       ;;
 
-   Linux | Darwin )
+   Linux | Darwin | AIX )
       VAR="A different value for Linux"
       DEFAULT_JDK=/none
       #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
diff --git a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
--- a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
+++ b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
@@ -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
diff --git a/test/javax/script/CommonSetup.sh b/test/javax/script/CommonSetup.sh
--- a/test/javax/script/CommonSetup.sh
+++ b/test/javax/script/CommonSetup.sh
@@ -36,7 +36,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/javax/security/auth/Subject/doAs/Test.sh b/test/javax/security/auth/Subject/doAs/Test.sh
--- a/test/javax/security/auth/Subject/doAs/Test.sh
+++ b/test/javax/security/auth/Subject/doAs/Test.sh
@@ -48,6 +48,11 @@
     FS="/"
     RM="/bin/rm -f"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    RM="/bin/rm -f"
+    ;;
   CYGWIN* )
     PS=";"
     FS="/"
diff --git a/test/lib/security/java.policy/Ext_AllPolicy.sh b/test/lib/security/java.policy/Ext_AllPolicy.sh
--- a/test/lib/security/java.policy/Ext_AllPolicy.sh
+++ b/test/lib/security/java.policy/Ext_AllPolicy.sh
@@ -53,7 +53,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh b/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
--- a/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
+++ b/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
@@ -42,7 +42,7 @@
 fi
 
 case $OS in
-SunOS | Linux | Darwin)
+SunOS | Linux | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     DFILESEP=$FILESEP
diff --git a/test/sun/net/ftp/MarkResetTest.sh b/test/sun/net/ftp/MarkResetTest.sh
--- a/test/sun/net/ftp/MarkResetTest.sh
+++ b/test/sun/net/ftp/MarkResetTest.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/net/www/http/HttpClient/RetryPost.sh b/test/sun/net/www/http/HttpClient/RetryPost.sh
--- a/test/sun/net/www/http/HttpClient/RetryPost.sh
+++ b/test/sun/net/www/http/HttpClient/RetryPost.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/net/www/protocol/jar/B5105410.sh b/test/sun/net/www/protocol/jar/B5105410.sh
--- a/test/sun/net/www/protocol/jar/B5105410.sh
+++ b/test/sun/net/www/protocol/jar/B5105410.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/net/www/protocol/jar/jarbug/run.sh b/test/sun/net/www/protocol/jar/jarbug/run.sh
--- a/test/sun/net/www/protocol/jar/jarbug/run.sh
+++ b/test/sun/net/www/protocol/jar/jarbug/run.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/rmi/rmic/newrmic/equivalence/batch.sh b/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
--- a/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
+++ b/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
@@ -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
 
diff --git a/test/sun/security/krb5/runNameEquals.sh b/test/sun/security/krb5/runNameEquals.sh
--- a/test/sun/security/krb5/runNameEquals.sh
+++ b/test/sun/security/krb5/runNameEquals.sh
@@ -66,6 +66,10 @@
         fi
     fi
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
--- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
+++ b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -72,6 +72,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=";"
diff --git a/test/sun/security/pkcs11/Provider/Login.sh b/test/sun/security/pkcs11/Provider/Login.sh
--- a/test/sun/security/pkcs11/Provider/Login.sh
+++ b/test/sun/security/pkcs11/Provider/Login.sh
@@ -73,6 +73,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=";"
diff --git a/test/sun/security/provider/KeyStore/DKSTest.sh b/test/sun/security/provider/KeyStore/DKSTest.sh
--- a/test/sun/security/provider/KeyStore/DKSTest.sh
+++ b/test/sun/security/provider/KeyStore/DKSTest.sh
@@ -50,15 +50,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS )
-    PS=":"
-    FS="/"
-    ;;
-  Linux )
-    PS=":"
-    FS="/"
-    ;;
-  Darwin )
+  SunOS | Linux | Darwin | AIX)
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
--- a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
+++ b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
@@ -63,6 +63,10 @@
     PS=":"
     FS="/"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    ;;
   CYGWIN* )
     PS=";"
     FS="/"
diff --git a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
+++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
+++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
@@ -46,7 +46,7 @@
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Linux | Darwin )
+    SunOS | Linux | Darwin | AIX )
         FILESEP="/"
         PATHSEP=":"
         ;;
diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/tools/jarsigner/AlgOptions.sh b/test/sun/security/tools/jarsigner/AlgOptions.sh
--- a/test/sun/security/tools/jarsigner/AlgOptions.sh
+++ b/test/sun/security/tools/jarsigner/AlgOptions.sh
@@ -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="/"
diff --git a/test/sun/security/tools/jarsigner/PercentSign.sh b/test/sun/security/tools/jarsigner/PercentSign.sh
--- a/test/sun/security/tools/jarsigner/PercentSign.sh
+++ b/test/sun/security/tools/jarsigner/PercentSign.sh
@@ -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="/"
diff --git a/test/sun/security/tools/jarsigner/diffend.sh b/test/sun/security/tools/jarsigner/diffend.sh
--- a/test/sun/security/tools/jarsigner/diffend.sh
+++ b/test/sun/security/tools/jarsigner/diffend.sh
@@ -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="/"
diff --git a/test/sun/security/tools/jarsigner/oldsig.sh b/test/sun/security/tools/jarsigner/oldsig.sh
--- a/test/sun/security/tools/jarsigner/oldsig.sh
+++ b/test/sun/security/tools/jarsigner/oldsig.sh
@@ -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="/"
diff --git a/test/sun/security/tools/keytool/AltProviderPath.sh b/test/sun/security/tools/keytool/AltProviderPath.sh
--- a/test/sun/security/tools/keytool/AltProviderPath.sh
+++ b/test/sun/security/tools/keytool/AltProviderPath.sh
@@ -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="/"
diff --git a/test/sun/security/tools/keytool/CloneKeyAskPassword.sh b/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
--- a/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
+++ b/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
@@ -59,6 +59,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/sun/security/tools/keytool/NoExtNPE.sh b/test/sun/security/tools/keytool/NoExtNPE.sh
--- a/test/sun/security/tools/keytool/NoExtNPE.sh
+++ b/test/sun/security/tools/keytool/NoExtNPE.sh
@@ -51,6 +51,10 @@
   Darwin )
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     FILESEP="/"
     ;;
diff --git a/test/sun/security/tools/keytool/SecretKeyKS.sh b/test/sun/security/tools/keytool/SecretKeyKS.sh
--- a/test/sun/security/tools/keytool/SecretKeyKS.sh
+++ b/test/sun/security/tools/keytool/SecretKeyKS.sh
@@ -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="/"
diff --git a/test/sun/security/tools/keytool/StandardAlgName.sh b/test/sun/security/tools/keytool/StandardAlgName.sh
--- a/test/sun/security/tools/keytool/StandardAlgName.sh
+++ b/test/sun/security/tools/keytool/StandardAlgName.sh
@@ -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="/"
diff --git a/test/sun/security/tools/keytool/StorePasswordsByShell.sh b/test/sun/security/tools/keytool/StorePasswordsByShell.sh
--- a/test/sun/security/tools/keytool/StorePasswordsByShell.sh
+++ b/test/sun/security/tools/keytool/StorePasswordsByShell.sh
@@ -46,15 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS )
-    PATHSEP=":"
-    FILESEP="/"
-    ;;
-  Linux )
-    PATHSEP=":"
-    FILESEP="/"
-    ;;
-  Darwin ) 
+  SunOS | Linux | Darwin | AIX)
     PATHSEP=":"
     FILESEP="/"
     ;;
diff --git a/test/sun/security/tools/keytool/printssl.sh b/test/sun/security/tools/keytool/printssl.sh
--- a/test/sun/security/tools/keytool/printssl.sh
+++ b/test/sun/security/tools/keytool/printssl.sh
@@ -40,7 +40,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     FS="/"
     ;;
   CYGWIN* )
diff --git a/test/sun/security/tools/keytool/resource.sh b/test/sun/security/tools/keytool/resource.sh
--- a/test/sun/security/tools/keytool/resource.sh
+++ b/test/sun/security/tools/keytool/resource.sh
@@ -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="/"
     ;;
diff --git a/test/sun/security/tools/keytool/standard.sh b/test/sun/security/tools/keytool/standard.sh
--- a/test/sun/security/tools/keytool/standard.sh
+++ b/test/sun/security/tools/keytool/standard.sh
@@ -45,7 +45,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | Darwin | AIX | CYGWIN* )
     FS="/"
     ;;
   Windows_* )
diff --git a/test/sun/security/tools/policytool/Alias.sh b/test/sun/security/tools/policytool/Alias.sh
--- a/test/sun/security/tools/policytool/Alias.sh
+++ b/test/sun/security/tools/policytool/Alias.sh
@@ -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="/"
diff --git a/test/sun/security/tools/policytool/ChangeUI.sh b/test/sun/security/tools/policytool/ChangeUI.sh
--- a/test/sun/security/tools/policytool/ChangeUI.sh
+++ b/test/sun/security/tools/policytool/ChangeUI.sh
@@ -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="/"
diff --git a/test/sun/security/tools/policytool/OpenPolicy.sh b/test/sun/security/tools/policytool/OpenPolicy.sh
--- a/test/sun/security/tools/policytool/OpenPolicy.sh
+++ b/test/sun/security/tools/policytool/OpenPolicy.sh
@@ -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="/"
diff --git a/test/sun/security/tools/policytool/SaveAs.sh b/test/sun/security/tools/policytool/SaveAs.sh
--- a/test/sun/security/tools/policytool/SaveAs.sh
+++ b/test/sun/security/tools/policytool/SaveAs.sh
@@ -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="/"
diff --git a/test/sun/security/tools/policytool/UpdatePermissions.sh b/test/sun/security/tools/policytool/UpdatePermissions.sh
--- a/test/sun/security/tools/policytool/UpdatePermissions.sh
+++ b/test/sun/security/tools/policytool/UpdatePermissions.sh
@@ -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="/"
diff --git a/test/sun/security/tools/policytool/UsePolicy.sh b/test/sun/security/tools/policytool/UsePolicy.sh
--- a/test/sun/security/tools/policytool/UsePolicy.sh
+++ b/test/sun/security/tools/policytool/UsePolicy.sh
@@ -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="/"
diff --git a/test/sun/security/tools/policytool/i18n.sh b/test/sun/security/tools/policytool/i18n.sh
--- a/test/sun/security/tools/policytool/i18n.sh
+++ b/test/sun/security/tools/policytool/i18n.sh
@@ -49,7 +49,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/tools/common/CommonSetup.sh b/test/sun/tools/common/CommonSetup.sh
--- a/test/sun/tools/common/CommonSetup.sh
+++ b/test/sun/tools/common/CommonSetup.sh
@@ -48,6 +48,7 @@
 #   isSolaris - true if OS is Solaris
 #   isWindows - true if OS is Windows
 #   isMacos   - true if OS is Macos X
+#   isAIX     - true if OS is AIX
 
 
 if [ -z "${TESTJAVA}" ]; then
@@ -83,6 +84,7 @@
 isUnknownOS=false
 isWindows=false
 isMacos=false
+isAIX=false
 
 OS=`uname -s`
 
@@ -113,6 +115,10 @@
     OS="Solaris"
     isSolaris=true
     ;;
+  AIX )
+    OS="AIX"
+    isAIX=true
+    ;;
   Windows* )
     OS="Windows"
     PATTERN_EOL='[
]*$'
diff --git a/test/sun/tools/jconsole/ResourceCheckTest.sh b/test/sun/tools/jconsole/ResourceCheckTest.sh
--- a/test/sun/tools/jconsole/ResourceCheckTest.sh
+++ b/test/sun/tools/jconsole/ResourceCheckTest.sh
@@ -54,7 +54,7 @@
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin)
+   SunOS | Linux | Darwin | AIX)
       PATHSEP=":"
       ;;
 
diff --git a/test/sun/tools/jinfo/Basic.sh b/test/sun/tools/jinfo/Basic.sh
--- a/test/sun/tools/jinfo/Basic.sh
+++ b/test/sun/tools/jinfo/Basic.sh
@@ -45,7 +45,7 @@
 
 runSA=true
 
-if [ $isMacos = true ]; then
+if [ $isMacos = true -o $isAIX = true -o `uname -m` = ppc64 ]; then
     runSA=false
 fi
 
diff --git a/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh b/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
--- a/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
+++ b/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
@@ -56,7 +56,7 @@
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       ;;
 
diff --git a/test/tools/launcher/ExecutionEnvironment.java b/test/tools/launcher/ExecutionEnvironment.java
--- a/test/tools/launcher/ExecutionEnvironment.java
+++ b/test/tools/launcher/ExecutionEnvironment.java
@@ -72,7 +72,9 @@
 public class ExecutionEnvironment extends TestHelper {
     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";
 
@@ -144,7 +146,19 @@
 
         for (String x : LD_PATH_STRINGS) {
             if (!tr.contains(x)) {
-                flagError(tr, "FAIL: did not get <" + x + ">");
+                if (TestHelper.isAIX && x.startsWith(LD_LIBRARY_PATH)) {
+                    // AIX does not support the '-rpath' linker options so the
+                    // launchers have to prepend the jdk library path to 'LIBPATH'.
+                    String aixLibPath = LD_LIBRARY_PATH + "=" +
+                        System.getenv(LD_LIBRARY_PATH) +
+                        System.getProperty("path.separator") + LD_LIBRARY_PATH_VALUE;
+                    if (!tr.matches(aixLibPath)) {
+                        flagError(tr, "FAIL: did not get <" + aixLibPath + ">");
+                    }
+                }
+                else {
+                    flagError(tr, "FAIL: did not get <" + x + ">");
+                }
             }
         }
     }
@@ -180,7 +194,7 @@
 
         Map<String, String> env = new HashMap<>();
 
-        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]);
diff --git a/test/tools/launcher/Settings.java b/test/tools/launcher/Settings.java
--- a/test/tools/launcher/Settings.java
+++ b/test/tools/launcher/Settings.java
@@ -73,16 +73,20 @@
     }
 
     static void runTestOptionDefault() throws IOException {
+        String stackSize = "256"; // in kb
+        if (getArch().equals("ppc64")) {
+            stackSize = "800";
+        }
         TestResult tr = null;
         tr = doExec(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 = doExec(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);
diff --git a/test/tools/launcher/TestHelper.java b/test/tools/launcher/TestHelper.java
--- a/test/tools/launcher/TestHelper.java
+++ b/test/tools/launcher/TestHelper.java
@@ -92,6 +92,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 String LIBJVM = isWindows
                         ? "jvm.dll"
                         : "libjvm" + (isMacOSX ? ".dylib" : ".so");