stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8028537: PPC64: Updated the JDK regression tests to run on AIX

Browse Source 
Co-authored-by: Jonathan Lu <luchsh@linux.vnet.ibm.com>
Co-authored-by: Steve Poole <spoole@linux.vnet.ibm.com>
Reviewed-by: alanb
This commit is contained in:
Volker Simonis 2014-01-17 21:54:30 +01:00
parent 378ba63ea9
commit 70041ae4e4
97 changed files with 236 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/test/ProblemList.txt
View File

@ -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 @@ sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh windows-all
# 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

2
jdk/test/com/sun/corba/5036554/TestCorbaBug.sh
View File

@ -48,7 +48,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/com/sun/corba/cachedSocket/7056731.sh
View File

@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
View File

@ -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.*;

2
jdk/test/com/sun/jdi/ImmutableResourceTest.sh
View File

@ -56,7 +56,7 @@ pass()
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PATHSEP=":"
;;

2
jdk/test/com/sun/jdi/JITDebug.sh
View File

@ -63,7 +63,7 @@ pass()
OS=`uname -s`
export TRANSPORT_METHOD
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;

22
jdk/test/com/sun/jdi/PrivateTransportTest.sh
View File

@ -102,7 +102,7 @@ libdir=${TESTCLASSES}
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 @@ elif [ -f ${libloc}/libdt_socket.so ] ; then
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}"

4
jdk/test/com/sun/jdi/ShellScaffold.sh
View File

@ -199,6 +199,8 @@ findPid()
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 @@ EOF
psCmd=ps
jstack=jstack.exe
;;
SunOS | Linux | Darwin)
SunOS | Linux | Darwin | AIX)
transport=dt_socket
address=
devnull=/dev/null

2
jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
View File

@ -45,7 +45,7 @@ fi
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
;;
Windows* | CYGWIN*)

8
jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
View File

@ -102,6 +102,14 @@ case "$OS" in
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"

8
jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
View File

@ -135,6 +135,14 @@ case "$OS" in
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"

2
jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
View File

@ -45,7 +45,7 @@ OS=`uname -s`
# 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=";" ;;

2
jdk/test/java/io/Serializable/serialver/classpath/run.sh
View File

@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;

2
jdk/test/java/io/Serializable/serialver/nested/run.sh
View File

@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;

3
jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
View File

@ -58,6 +58,9 @@ case "$OS" in
Darwin )
FS="/"
;;
AIX )
FS="/"
;;
Windows*)
FS="\\"
;;

3
jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
View File

@ -63,6 +63,9 @@ case "$OS" in
Darwin )
FS="/"
;;
AIX )
FS="/"
;;
Windows* | CYGWIN* )
FS="\\"
;;

2
jdk/test/java/lang/StringCoding/CheckEncodings.sh
View File

@ -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 ;;

2
jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
View File

@ -48,7 +48,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin)
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

4
jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
View File

@ -47,6 +47,10 @@ case "$OS" in
PS=":"
FS="/"
;;
AIX )
PS=":"
FS="/"
;;
Windows*)
PS=";"
OS="Windows"

2
jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
View File

@ -61,7 +61,7 @@ i=1
while true; do
echo "Run $i: TestSystemLoadAvg"
case `uname -s` in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
runOne GetSystemLoadAverage
;;
* )

2
jdk/test/java/net/Authenticator/B4933582.sh
View File

@ -26,7 +26,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/net/DatagramSocket/Send12k.java
View File

@ -53,7 +53,7 @@ public class Send12k {
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.

2
jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
View File

@ -27,7 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Darwin )
SunOS | Darwin | AIX )
PATHSEP=":"
FILESEP="/"
;;

2
jdk/test/java/net/Socket/OldSocketImpl.sh
View File

@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/net/URL/B5086147.sh
View File

@ -26,7 +26,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
exit 0
;;
CYGWIN* )

2
jdk/test/java/net/URLClassLoader/B5077773.sh
View File

@ -34,7 +34,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Darwin )
SunOS | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
View File

@ -27,7 +27,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Darwin )
SunOS | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/net/URLConnection/6212146/test.sh
View File

@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Darwin )
SunOS | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
View File

@ -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 ;;

4
jdk/test/java/nio/charset/spi/basic.sh
View File

@ -48,7 +48,7 @@ JAR=$COMPILEJAVA/bin/jar
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 @@ if [ $# -gt 0 ]; then
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

2
jdk/test/java/nio/file/Files/SBC.java
View File

@ -235,7 +235,7 @@ public class SBC {
try {
Files.newByteChannel(link, READ, LinkOption.NOFOLLOW_LINKS);
throw new RuntimeException();
} catch (IOException x) {
} catch (IOException | UnsupportedOperationException x) {
} finally {
TestUtil.deleteUnchecked(link);
}

9
jdk/test/java/nio/file/Files/walkFileTree/find.sh
View File

@ -43,7 +43,14 @@ case "$OS" in
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 @@ if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
# 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 ];

2
jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
View File

@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
;;
Windows* | CYGWIN* )

2
jdk/test/java/rmi/registry/readTest/readTest.sh
View File

@ -30,7 +30,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
FILEURL="file:"

4
jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
View File

@ -62,6 +62,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"

4
jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
View File

@ -46,6 +46,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"

4
jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
View File

@ -70,6 +70,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
Windows* )
PATHSEP=";"
FILESEP="\\"

4
jdk/test/java/security/Security/signedfirst/Dyn.sh
View File

@ -62,6 +62,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"

4
jdk/test/java/security/Security/signedfirst/Static.sh
View File

@ -62,6 +62,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"

2
jdk/test/java/util/Currency/PropertiesTest.sh
View File

@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/util/Locale/LocaleCategory.sh
View File

@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | *BSD | Darwin )
SunOS | Linux | *BSD | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/util/Locale/LocaleProviders.sh
View File

@ -56,7 +56,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | *BSD | Darwin )
SunOS | Linux | *BSD | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/util/PluggableLocale/ExecTest.sh
View File

@ -62,7 +62,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
View File

@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PATHSEP=":"
FILESEP="/"
;;

2
jdk/test/java/util/ServiceLoader/basic.sh
View File

@ -43,7 +43,7 @@ JAR="$COMPILEJAVA/bin/jar"
OS=`uname -s`
case "$OS" in
SunOS | Darwin )
SunOS | Darwin | AIX )
SEP=':' ;;
Linux )
SEP=':' ;;

6
jdk/test/java/util/logging/AnonLoggerWeakRefLeak.sh
View File

@ -83,9 +83,9 @@ if [ "$status" != 0 ]; then
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

6
jdk/test/java/util/logging/LoggerWeakRefLeak.sh
View File

@ -83,9 +83,9 @@ if [ "$status" != 0 ]; then
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

2
jdk/test/java/util/prefs/CheckUserPrefsStorage.sh
View File

@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
View File

@ -56,7 +56,7 @@ echo "TESTCLASSES=${TESTCLASSES}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
View File

@ -89,7 +89,7 @@ case "$OS" in
FILESEP="/"
;;
Linux | Darwin )
Linux | Darwin | AIX )
VAR="A different value for Linux"
DEFAULT_JDK=/none
#DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386

2
jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
View File

@ -90,7 +90,7 @@ case "$OS" in
FILESEP="/"
;;
Linux | Darwin )
Linux | Darwin | AIX )
VAR="A different value for Linux"
DEFAULT_JDK=/none
#DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386

8
jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
View File

@ -92,6 +92,14 @@ case "$OS" in
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

2
jdk/test/javax/script/CommonSetup.sh
View File

@ -36,7 +36,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

5
jdk/test/javax/security/auth/Subject/doAs/Test.sh
View File

@ -48,6 +48,11 @@ case "$OS" in
FS="/"
RM="/bin/rm -f"
;;
AIX )
PS=":"
FS="/"
RM="/bin/rm -f"
;;
CYGWIN* )
PS=";"
FS="/"

2
jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
View File

@ -53,7 +53,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
View File

@ -42,7 +42,7 @@ if [[ $OS == CYGWIN_NT* ]] ; then
fi
case $OS in
SunOS | Linux | Darwin)
SunOS | Linux | Darwin | AIX )
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP

2
jdk/test/sun/net/ftp/MarkResetTest.sh
View File

@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
View File

@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/sun/net/www/protocol/jar/B5105410.sh
View File

@ -31,7 +31,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
View File

@ -31,7 +31,7 @@ DEST=`pwd`
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

12
jdk/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
View File

@ -61,13 +61,13 @@ mkdir $newv11dir $newvcompatdir $newv12dir
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

4
jdk/test/sun/security/krb5/runNameEquals.sh
View File

@ -66,6 +66,10 @@ case "$OS" in
fi
fi
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"

6
jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
View File

@ -72,6 +72,12 @@ case "$OS" in
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=";"

6
jdk/test/sun/security/pkcs11/Provider/Login.sh
View File

@ -73,6 +73,12 @@ case "$OS" in
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=";"

10
jdk/test/sun/security/provider/KeyStore/DKSTest.sh
View File

@ -50,15 +50,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS )
PS=":"
FS="/"
;;
Linux )
PS=":"
FS="/"
;;
Darwin )
SunOS | Linux | Darwin | AIX)
PS=":"
FS="/"
;;

4
jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
View File

@ -63,6 +63,10 @@ case "$OS" in
PS=":"
FS="/"
;;
AIX )
PS=":"
FS="/"
;;
CYGWIN* )
PS=";"
FS="/"

2
jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
View File

@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
View File

@ -46,7 +46,7 @@ fi
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
FILESEP="/"
PATHSEP=":"
;;

2
jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
View File

@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
View File

@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PS=":"
FS="/"
;;

2
jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/jarsigner/PercentSign.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/jarsigner/diffend.sh
View File

@ -41,7 +41,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/jarsigner/oldsig.sh
View File

@ -42,7 +42,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/keytool/AltProviderPath.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

4
jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
View File

@ -59,6 +59,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"

4
jdk/test/sun/security/tools/keytool/NoExtNPE.sh
View File

@ -51,6 +51,10 @@ case "$OS" in
Darwin )
FILESEP="/"
;;
AIX )
PATHSEP=":"
FILESEP="/"
;;
CYGWIN* )
FILESEP="/"
;;

2
jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
View File

@ -45,7 +45,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/keytool/StandardAlgName.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

10
jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh
View File

@ -46,15 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS )
PATHSEP=":"
FILESEP="/"
;;
Linux )
PATHSEP=":"
FILESEP="/"
;;
Darwin )
SunOS | Linux | Darwin | AIX)
PATHSEP=":"
FILESEP="/"
;;

2
jdk/test/sun/security/tools/keytool/printssl.sh
View File

@ -40,7 +40,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
FS="/"
;;
CYGWIN* )

2
jdk/test/sun/security/tools/keytool/resource.sh
View File

@ -43,7 +43,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
FS="/"
;;

2
jdk/test/sun/security/tools/keytool/standard.sh
View File

@ -45,7 +45,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin | CYGWIN* )
SunOS | Linux | Darwin | AIX | CYGWIN* )
FS="/"
;;
Windows_* )

2
jdk/test/sun/security/tools/policytool/Alias.sh
View File

@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/policytool/ChangeUI.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/policytool/OpenPolicy.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/policytool/SaveAs.sh
View File

@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/policytool/UpdatePermissions.sh
View File

@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/policytool/UsePolicy.sh
View File

@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

2
jdk/test/sun/security/tools/policytool/i18n.sh
View File

@ -49,7 +49,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
NULL=/dev/null
PS=":"
FS="/"

6
jdk/test/sun/tools/common/CommonSetup.sh
View File

@ -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 @@ isSolaris=false
isUnknownOS=false
isWindows=false
isMacos=false
isAIX=false
OS=`uname -s`
@ -113,6 +115,10 @@ case "$OS" in
OS="Solaris"
isSolaris=true
;;
AIX )
OS="AIX"
isAIX=true
;;
Windows* )
OS="Windows"
PATTERN_EOL='[ ]*$'

2
jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
View File

@ -54,7 +54,7 @@ pass()
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin)
SunOS | Linux | Darwin | AIX)
PATHSEP=":"
;;

2
jdk/test/sun/tools/jinfo/Basic.sh
View File

@ -45,7 +45,7 @@ failed=0
runSA=true
if [ $isMacos = true ]; then
if [ $isMacos = true -o $isAIX = true -o `uname -m` = ppc64 ]; then
runSA=false
fi

2
jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
View File

@ -56,7 +56,7 @@ pass()
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin )
SunOS | Linux | Darwin | AIX )
PATHSEP=":"
;;

20
jdk/test/tools/launcher/ExecutionEnvironment.java
View File

@ -72,7 +72,9 @@ import java.util.regex.Pattern;
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 @@ public class ExecutionEnvironment extends TestHelper {
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 @@ public class ExecutionEnvironment extends TestHelper {
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]);

8
jdk/test/tools/launcher/Settings.java
View File

@ -73,16 +73,20 @@ public class Settings extends TestHelper {
}
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);

2
jdk/test/tools/launcher/TestHelper.java
View File

@ -92,6 +92,8 @@ public class TestHelper {
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");