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
--- a/jdk/test/ProblemList.txt Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/ProblemList.txt Fri Jan 17 21:54:30 2014 +0100
@@ -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
--- a/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/com/sun/corba/cachedSocket/7056731.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/corba/cachedSocket/7056731.sh Fri Jan 17 21:54:30 2014 +0100
@@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java Fri Jan 17 21:54:30 2014 +0100
@@ -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.*;
--- a/jdk/test/com/sun/jdi/ImmutableResourceTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/jdi/ImmutableResourceTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -56,7 +56,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PATHSEP=":"
;;
--- a/jdk/test/com/sun/jdi/JITDebug.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/jdi/JITDebug.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/com/sun/jdi/PrivateTransportTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/jdi/PrivateTransportTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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}"
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Fri Jan 17 21:54:30 2014 +0100
@@ -45,7 +45,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
;;
Windows* | CYGWIN*)
--- a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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"
--- a/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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=";" ;;
--- a/jdk/test/java/io/Serializable/serialver/classpath/run.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/io/Serializable/serialver/classpath/run.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/io/Serializable/serialver/nested/run.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/io/Serializable/serialver/nested/run.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Fri Jan 17 21:54:30 2014 +0100
@@ -58,6 +58,9 @@
Darwin )
FS="/"
;;
+ AIX )
+ FS="/"
+ ;;
Windows*)
FS="\\"
;;
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Fri Jan 17 21:54:30 2014 +0100
@@ -63,6 +63,9 @@
Darwin )
FS="/"
;;
+ AIX )
+ FS="/"
+ ;;
Windows* | CYGWIN* )
FS="\\"
;;
--- a/jdk/test/java/lang/StringCoding/CheckEncodings.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/lang/StringCoding/CheckEncodings.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Fri Jan 17 21:54:30 2014 +0100
@@ -47,6 +47,10 @@
PS=":"
FS="/"
;;
+ AIX )
+ PS=":"
+ FS="/"
+ ;;
Windows*)
PS=";"
OS="Windows"
--- a/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/net/Authenticator/B4933582.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/Authenticator/B4933582.sh Fri Jan 17 21:54:30 2014 +0100
@@ -26,7 +26,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/net/DatagramSocket/Send12k.java Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/DatagramSocket/Send12k.java Fri Jan 17 21:54:30 2014 +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/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Fri Jan 17 21:54:30 2014 +0100
@@ -27,7 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Darwin )
+ SunOS | Darwin | AIX )
PATHSEP=":"
FILESEP="/"
;;
--- a/jdk/test/java/net/Socket/OldSocketImpl.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/Socket/OldSocketImpl.sh Fri Jan 17 21:54:30 2014 +0100
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/net/URL/B5086147.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/URL/B5086147.sh Fri Jan 17 21:54:30 2014 +0100
@@ -26,7 +26,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
exit 0
;;
CYGWIN* )
--- a/jdk/test/java/net/URLClassLoader/B5077773.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/URLClassLoader/B5077773.sh Fri Jan 17 21:54:30 2014 +0100
@@ -34,7 +34,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Darwin )
+ SunOS | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Fri Jan 17 21:54:30 2014 +0100
@@ -27,7 +27,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Darwin )
+ SunOS | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/net/URLConnection/6212146/test.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/net/URLConnection/6212146/test.sh Fri Jan 17 21:54:30 2014 +0100
@@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Darwin )
+ SunOS | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/nio/charset/spi/basic.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/nio/charset/spi/basic.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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
--- a/jdk/test/java/nio/file/Files/SBC.java Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/nio/file/Files/SBC.java Fri Jan 17 21:54:30 2014 +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/jdk/test/java/nio/file/Files/walkFileTree/find.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/nio/file/Files/walkFileTree/find.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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 ];
--- a/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Fri Jan 17 21:54:30 2014 +0100
@@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
;;
Windows* | CYGWIN* )
--- a/jdk/test/java/rmi/registry/readTest/readTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/rmi/registry/readTest/readTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -30,7 +30,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
FILEURL="file:"
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Fri Jan 17 21:54:30 2014 +0100
@@ -62,6 +62,10 @@
PATHSEP=":"
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Fri Jan 17 21:54:30 2014 +0100
@@ -46,6 +46,10 @@
PATHSEP=":"
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Fri Jan 17 21:54:30 2014 +0100
@@ -70,6 +70,10 @@
PATHSEP=":"
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
Windows* )
PATHSEP=";"
FILESEP="\\"
--- a/jdk/test/java/security/Security/signedfirst/Dyn.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/security/Security/signedfirst/Dyn.sh Fri Jan 17 21:54:30 2014 +0100
@@ -62,6 +62,10 @@
PATHSEP=":"
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
--- a/jdk/test/java/security/Security/signedfirst/Static.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/security/Security/signedfirst/Static.sh Fri Jan 17 21:54:30 2014 +0100
@@ -62,6 +62,10 @@
PATHSEP=":"
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
--- a/jdk/test/java/util/Currency/PropertiesTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/util/Locale/LocaleCategory.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/Locale/LocaleCategory.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
;;
--- a/jdk/test/java/util/Locale/LocaleProviders.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/Locale/LocaleProviders.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
;;
--- a/jdk/test/java/util/PluggableLocale/ExecTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -62,7 +62,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/util/ServiceLoader/basic.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/ServiceLoader/basic.sh Fri Jan 17 21:54:30 2014 +0100
@@ -43,7 +43,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Darwin )
+ SunOS | Darwin | AIX )
SEP=':' ;;
Linux )
SEP=':' ;;
--- a/jdk/test/java/util/logging/AnonLoggerWeakRefLeak.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/logging/AnonLoggerWeakRefLeak.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/util/logging/LoggerWeakRefLeak.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/logging/LoggerWeakRefLeak.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Fri Jan 17 21:54:30 2014 +0100
@@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
--- a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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
--- a/jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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
--- a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/javax/script/CommonSetup.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/javax/script/CommonSetup.sh Fri Jan 17 21:54:30 2014 +0100
@@ -36,7 +36,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/javax/security/auth/Subject/doAs/Test.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/javax/security/auth/Subject/doAs/Test.sh Fri Jan 17 21:54:30 2014 +0100
@@ -48,6 +48,11 @@
FS="/"
RM="/bin/rm -f"
;;
+ AIX )
+ PS=":"
+ FS="/"
+ RM="/bin/rm -f"
+ ;;
CYGWIN* )
PS=";"
FS="/"
--- a/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
--- a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Fri Jan 17 21:54:30 2014 +0100
@@ -42,7 +42,7 @@
fi
case $OS in
-SunOS | Linux | Darwin)
+SunOS | Linux | Darwin | AIX )
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
--- a/jdk/test/sun/net/ftp/MarkResetTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/net/ftp/MarkResetTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Fri Jan 17 21:54:30 2014 +0100
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/net/www/protocol/jar/B5105410.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/net/www/protocol/jar/B5105410.sh Fri Jan 17 21:54:30 2014 +0100
@@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Fri Jan 17 21:54:30 2014 +0100
@@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/rmi/rmic/newrmic/equivalence/batch.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/rmi/rmic/newrmic/equivalence/batch.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/krb5/runNameEquals.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/krb5/runNameEquals.sh Fri Jan 17 21:54:30 2014 +0100
@@ -66,6 +66,10 @@
fi
fi
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
--- a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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=";"
--- a/jdk/test/sun/security/pkcs11/Provider/Login.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/pkcs11/Provider/Login.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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=";"
--- a/jdk/test/sun/security/provider/KeyStore/DKSTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/provider/KeyStore/DKSTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
;;
--- a/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Fri Jan 17 21:54:30 2014 +0100
@@ -63,6 +63,10 @@
PS=":"
FS="/"
;;
+ AIX )
+ PS=":"
+ FS="/"
+ ;;
CYGWIN* )
PS=";"
FS="/"
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Fri Jan 17 21:54:30 2014 +0100
@@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -46,7 +46,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
FILESEP="/"
PATHSEP=":"
;;
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Fri Jan 17 21:54:30 2014 +0100
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Fri Jan 17 21:54:30 2014 +0100
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;
--- a/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/jarsigner/PercentSign.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/jarsigner/PercentSign.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/jarsigner/diffend.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/jarsigner/diffend.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/jarsigner/oldsig.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/jarsigner/oldsig.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/keytool/AltProviderPath.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/AltProviderPath.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Fri Jan 17 21:54:30 2014 +0100
@@ -59,6 +59,10 @@
PATHSEP=":"
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
--- a/jdk/test/sun/security/tools/keytool/NoExtNPE.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/NoExtNPE.sh Fri Jan 17 21:54:30 2014 +0100
@@ -51,6 +51,10 @@
Darwin )
FILESEP="/"
;;
+ AIX )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
FILESEP="/"
;;
--- a/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/keytool/StandardAlgName.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/StandardAlgName.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
;;
--- a/jdk/test/sun/security/tools/keytool/printssl.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/printssl.sh Fri Jan 17 21:54:30 2014 +0100
@@ -40,7 +40,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
FS="/"
;;
CYGWIN* )
--- a/jdk/test/sun/security/tools/keytool/resource.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/resource.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/keytool/standard.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/keytool/standard.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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_* )
--- a/jdk/test/sun/security/tools/policytool/Alias.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/Alias.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/policytool/ChangeUI.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/ChangeUI.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/policytool/OpenPolicy.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/OpenPolicy.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/policytool/SaveAs.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/SaveAs.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/policytool/UsePolicy.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/UsePolicy.sh Fri Jan 17 21:54:30 2014 +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/jdk/test/sun/security/tools/policytool/i18n.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/security/tools/policytool/i18n.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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="/"
--- a/jdk/test/sun/tools/common/CommonSetup.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/tools/common/CommonSetup.sh Fri Jan 17 21:54:30 2014 +0100
@@ -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='[
]*$'
--- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -54,7 +54,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin)
+ SunOS | Linux | Darwin | AIX)
PATHSEP=":"
;;
--- a/jdk/test/sun/tools/jinfo/Basic.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/tools/jinfo/Basic.sh Fri Jan 17 21:54:30 2014 +0100
@@ -45,7 +45,7 @@
runSA=true
-if [ $isMacos = true ]; then
+if [ $isMacos = true -o $isAIX = true -o `uname -m` = ppc64 ]; then
runSA=false
fi
--- a/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Fri Jan 17 21:54:30 2014 +0100
@@ -56,7 +56,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux | Darwin )
+ SunOS | Linux | Darwin | AIX )
PATHSEP=":"
;;
--- a/jdk/test/tools/launcher/ExecutionEnvironment.java Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/tools/launcher/ExecutionEnvironment.java Fri Jan 17 21:54:30 2014 +0100
@@ -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]);
--- a/jdk/test/tools/launcher/Settings.java Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/tools/launcher/Settings.java Fri Jan 17 21:54:30 2014 +0100
@@ -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);
--- a/jdk/test/tools/launcher/TestHelper.java Wed Jan 08 11:19:25 2014 -0800
+++ b/jdk/test/tools/launcher/TestHelper.java Fri Jan 17 21:54:30 2014 +0100
@@ -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");