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

8194869: [TESTBUG][aix, s390] Adapt tests to platforms

Browse Source 
Reviewed-by: mbaesken, simonis, dholmes, serb
This commit is contained in:
Goetz Lindenmaier 2018-01-18 10:26:39 +01:00
parent 9b57b22eff
commit 0480f69dd5
9 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/OS.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -38,7 +38,9 @@ class OS {
} }
private OS(String name) { private OS(String name) {
if (name.startsWith("Linux")) { if (name.startsWith("AIX")) {
family = "aix";
} else if (name.startsWith("Linux")) {
family = "linux"; family = "linux";
} else if (name.startsWith("Mac") || name.startsWith("Darwin")) { } else if (name.startsWith("Mac") || name.startsWith("Darwin")) {
family = "mac"; family = "mac";

4
test/jdk/java/awt/FontClass/CreateFont/fileaccess/TestFontFile.sh
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -46,7 +46,7 @@ BIT_FLAG=""
# set platform-dependent variables # set platform-dependent variables
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux | Darwin ) AIX | Darwin | Linux | SunOS )
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"

6
test/jdk/java/awt/JAWT/JAWT.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -62,6 +62,10 @@ case "$OS" in
MAKE="make" MAKE="make"
LD_LIBRARY_PATH="." LD_LIBRARY_PATH="."
;; ;;
AIX )
echo "Test passed. Not supported on AIX."
exit 0
;;
SunOS ) SunOS )
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"

4
test/jdk/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh
View File

@ -1,7 +1,7 @@
#!/bin/ksh -p #!/bin/ksh -p
# #
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,7 @@ pass()
# The beginning of the script proper # The beginning of the script proper
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux | Darwin | CYGWIN* ) AIX | CYGWIN* | Darwin | Linux | SunOS )
FILESEP="/" FILESEP="/"
;; ;;

6
test/jdk/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh
View File

@ -1,7 +1,7 @@
#!/bin/ksh -p #!/bin/ksh -p
# #
# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -59,7 +59,7 @@ pass()
# Checking for proper OS # Checking for proper OS
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux | Darwin | CYGWIN* ) AIX | CYGWIN* | Darwin | Linux | SunOS )
FILESEP="/" FILESEP="/"
;; ;;
@ -172,7 +172,7 @@ case "$OS" in
fi fi
;; ;;
SunOS | Linux ) AIX | Linux | SunOS )
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \ ${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
--add-opens java.desktop/sun.awt=ALL-UNNAMED \ --add-opens java.desktop/sun.awt=ALL-UNNAMED \
--add-opens java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \ --add-opens java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \

22
test/jdk/javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh
View File

@ -1,5 +1,5 @@
#!/bin/ksh -p #!/bin/ksh -p
# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -86,8 +86,24 @@ clean()
# Checking for proper OS # Checking for proper OS
OS=`uname -s` OS=`uname -s`
MKTEMP="mktemp"
case "$OS" in case "$OS" in
SunOS | Linux | Darwin ) AIX )
FILESEP="/"
PATHSEP=":"
TMP=`cd /tmp; pwd -P`
type ${MKTEMP} > /dev/null 2>&1
if ! [ $? -ne 0 ] ; then
MKTEMP="/opt/freeware/bin/mktemp"
fi
if ! [ -e ${MKTEMP} ] ; then
pass "Test skipped because no mktemp found on this machine"
fi
;;
Darwin | Linux | SunOS )
FILESEP="/" FILESEP="/"
PATHSEP=":" PATHSEP=":"
TMP=`cd /tmp; pwd -P` TMP=`cd /tmp; pwd -P`
@ -180,7 +196,7 @@ echo ------ PREPARE TEST PLUGIN ---------
# app have file read permission for all subdirs of the # app have file read permission for all subdirs of the
# scratch dir # scratch dir
PLUGINDST_DIR=$(mktemp -d ${TMP}/iio_test.XXXXXXXX) PLUGINDST_DIR=$(${MKTEMP} -d ${TMP}/iio_test.XXXXXXXX)
echo "Created PLUGINDST_DIR as ${PLUGINDST_DIR}" echo "Created PLUGINDST_DIR as ${PLUGINDST_DIR}"
TEST_PLUGIN=dummy.jar TEST_PLUGIN=dummy.jar

4
test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -50,7 +50,7 @@ fi
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux | Darwin | CYGWIN* ) AIX | CYGWIN* | Darwin | Linux | SunOS )
FS="/" FS="/"
;; ;;
Windows_* ) Windows_* )

3
test/jdk/sun/security/pkcs11/PKCS11Test.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -624,6 +624,7 @@ public abstract class PKCS11Test {
"/usr/lib64/"}); "/usr/lib64/"});
osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"}); osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"}); osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
osMap.put("Linux-s390x-64", new String[]{"/usr/lib64/"});
osMap.put("Windows-x86-32", new String[]{ osMap.put("Windows-x86-32", new String[]{
PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)}); PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
osMap.put("Windows-amd64-64", new String[]{ osMap.put("Windows-amd64-64", new String[]{

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

@ -1,5 +1,5 @@
# #
# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,7 @@ fi
# set platform-dependent variables # set platform-dependent variables
OS=`uname -s` OS=`uname -s`
case "$OS" in case "$OS" in
SunOS | Linux | Darwin ) AIX | Darwin | Linux | SunOS )
NULL=/dev/null NULL=/dev/null
PS=":" PS=":"
FS="/" FS="/"