mirror of
https://github.com/openjdk/jdk.git
synced 2026-06-06 18:53:37 +00:00
8385345: AWT and ImageIO shell tests fail when run using MSys/MinGW
Reviewed-by: prr, macarte
This commit is contained in:
parent
0eeacb5b38
commit
b66dcc9474
@ -36,7 +36,7 @@
|
||||
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Windows* | CYGWIN* | Darwin)
|
||||
Windows* | CYGWIN* | MSYS* | MINGW* | Darwin)
|
||||
echo "Passed"; exit 0 ;;
|
||||
* ) unset DISPLAY ;;
|
||||
esac
|
||||
|
||||
@ -83,7 +83,7 @@ case "$OS" in
|
||||
fi
|
||||
SYST="windows"
|
||||
;;
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
NULL=/dev/null
|
||||
PS=":"
|
||||
FS="/"
|
||||
|
||||
@ -60,7 +60,7 @@ pass()
|
||||
# The beginning of the script proper
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
AIX | CYGWIN* | Darwin | Linux )
|
||||
AIX | CYGWIN* | MSYS* | MINGW* | Darwin | Linux )
|
||||
FILESEP="/"
|
||||
;;
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@ case "$OS" in
|
||||
TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
|
||||
;;
|
||||
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
VAR="A different value for Cygwin"
|
||||
DEFAULT_JDK="/cygdrive/c/Program\ Files/Java/jdk1.8.0"
|
||||
FILESEP="/"
|
||||
|
||||
@ -23,7 +23,7 @@ ${TESTJAVA}/bin/javac -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
|
||||
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Windows* | CYGWIN* | Darwin)
|
||||
Windows* | CYGWIN* | MSYS* | MINGW* | Darwin)
|
||||
echo "Passed"; exit 0 ;;
|
||||
esac
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ echo "Creating manifest file..."
|
||||
|
||||
OS=`uname -s`
|
||||
case ${OS} in
|
||||
CYGWIN*)
|
||||
CYGWIN* | MSYS* | MINGW*)
|
||||
CYGWIN="CYGWIN"
|
||||
;;
|
||||
*)
|
||||
|
||||
@ -52,7 +52,7 @@ case "$OS" in
|
||||
OS="Windows"
|
||||
FS="\\"
|
||||
;;
|
||||
CYGWIN*)
|
||||
CYGWIN* | MSYS* | MINGW*)
|
||||
PS=";"
|
||||
OS="Windows"
|
||||
FS="\\"
|
||||
|
||||
@ -96,7 +96,7 @@ case "$OS" in
|
||||
FILESEP="\\"
|
||||
;;
|
||||
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
VAR="A different value for CYGWIN"
|
||||
DEFAULT_JDK=/none
|
||||
FILESEP="/"
|
||||
|
||||
@ -97,7 +97,7 @@ case "$OS" in
|
||||
FILESEP="\\"
|
||||
;;
|
||||
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
VAR="A different value for CYGWIN"
|
||||
DEFAULT_JDK=/none
|
||||
FILESEP="/"
|
||||
|
||||
@ -60,7 +60,7 @@ $JAR cf $PLUGINDIR/simp.jar -C $TESTCLASSES/tmpdir META-INF/services \
|
||||
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Windows_* | CYGWIN* )
|
||||
Windows_* | CYGWIN* | MSYS* | MINGW* )
|
||||
CPSEP=";"
|
||||
;;
|
||||
* )
|
||||
|
||||
@ -115,7 +115,7 @@ case "$OS" in
|
||||
TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
|
||||
;;
|
||||
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
FILESEP="/"
|
||||
PATHSEP=";"
|
||||
TMP="/tmp"
|
||||
@ -243,7 +243,7 @@ echo
|
||||
|
||||
|
||||
case "$OS" in
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
TEST_CODEBASE=$(cygpath -m ${PWD})
|
||||
TEST_PLUGIN_JAR=$(cygpath -m ${PLUGINDST_DIR}${FILESEP}${TEST_PLUGIN})
|
||||
;;
|
||||
|
||||
@ -45,7 +45,7 @@ case "$OS" in
|
||||
OS="Windows"
|
||||
FS="\\"
|
||||
;;
|
||||
CYGWIN* )
|
||||
CYGWIN* | MSYS* | MINGW* )
|
||||
PS=";"
|
||||
OS="Windows"
|
||||
FS="\\"
|
||||
|
||||
@ -40,7 +40,7 @@ setup() {
|
||||
|
||||
OS=`uname -s`
|
||||
case ${OS} in
|
||||
Windows_* | CYGWIN*)
|
||||
Windows_* | CYGWIN* | MSYS* | MINGW*)
|
||||
PS=";"
|
||||
FS="\\"
|
||||
;;
|
||||
@ -54,7 +54,7 @@ setup() {
|
||||
verify_os() {
|
||||
OS=`uname -s`
|
||||
case ${OS} in
|
||||
Windows_95 | Windows_98 | Windows_ME | CYGWIN* )
|
||||
Windows_95 | Windows_98 | Windows_ME | CYGWIN* | MSYS* | MINGW* )
|
||||
echo "Test bypassed: jvmstat feature not supported on ${OS}"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@ -63,7 +63,7 @@ OS=`uname -s`;
|
||||
#
|
||||
IsWindows() {
|
||||
case "$OS" in
|
||||
Windows* | CYGWIN* )
|
||||
Windows* | CYGWIN* | MSYS* | MINGW* )
|
||||
printf "true"
|
||||
;;
|
||||
* )
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user