From 71e471aa292d09722c9332aeb0d2352bf6f3e6b5 Mon Sep 17 00:00:00 2001 From: coleenp Date: Wed, 29 Aug 2012 14:49:05 -0400 Subject: [PATCH] 7191926: Remove MKS dependency in Hotspot regression tests Summary: Add case for CYGWIN in .sh files. Reviewed-by: coleenp, kvn Contributed-by: pavel.punegov@oracle.com --- test/compiler/6894807/Test6894807.sh | 5 +++++ test/gc/6941923/test6941923.sh | 2 +- test/runtime/6626217/Test6626217.sh | 8 ++++++++ test/runtime/6878713/Test6878713.sh | 5 +++++ test/runtime/7020373/Test7020373.sh | 5 +++++ test/runtime/7051189/Xchecksig.sh | 2 +- test/runtime/7110720/Test7110720.sh | 6 ++++++ test/runtime/7158800/Test7158800.sh | 5 +++++ test/runtime/7158988/TestFieldMonitor.sh | 12 ++++++++++++ 9 files changed, 48 insertions(+), 2 deletions(-) diff --git a/test/compiler/6894807/Test6894807.sh b/test/compiler/6894807/Test6894807.sh index 20fee43ea..229fb5451 100644 --- a/test/compiler/6894807/Test6894807.sh +++ b/test/compiler/6894807/Test6894807.sh @@ -31,6 +31,11 @@ case "$OS" in PS=";" FS="\\" ;; + CYGWIN_* ) + NULL=/dev/null + PS=";" + FS="/" + ;; * ) echo "Unrecognized system!" exit 1; diff --git a/test/gc/6941923/test6941923.sh b/test/gc/6941923/test6941923.sh index e66419635..0c751de12 100644 --- a/test/gc/6941923/test6941923.sh +++ b/test/gc/6941923/test6941923.sh @@ -14,7 +14,7 @@ case "$OS" in PS=":" FS="/" ;; - Windows_* ) + Windows_* | CYGWIN_* ) echo "Test skipped for Windows" exit 0 ;; diff --git a/test/runtime/6626217/Test6626217.sh b/test/runtime/6626217/Test6626217.sh index e7414983b..a8c8a2395 100644 --- a/test/runtime/6626217/Test6626217.sh +++ b/test/runtime/6626217/Test6626217.sh @@ -65,6 +65,14 @@ case "$OS" in CP=cp MV=mv ;; + CYGWIN_* ) + NULL=/dev/null + PS=";" + FS="/" + RM=rm + CP=cp + MV=mv + ;; * ) echo "Unrecognized system!" exit 1; diff --git a/test/runtime/6878713/Test6878713.sh b/test/runtime/6878713/Test6878713.sh index 73d91fc0c..a452ad58f 100644 --- a/test/runtime/6878713/Test6878713.sh +++ b/test/runtime/6878713/Test6878713.sh @@ -38,6 +38,11 @@ case "$OS" in PS=";" FS="\\" ;; + CYGWIN_* ) + NULL=/dev/null + PS=";" + FS="/" + ;; * ) echo "Unrecognized system!" exit 1; diff --git a/test/runtime/7020373/Test7020373.sh b/test/runtime/7020373/Test7020373.sh index 54b8b3297..83e7f4c44 100644 --- a/test/runtime/7020373/Test7020373.sh +++ b/test/runtime/7020373/Test7020373.sh @@ -40,6 +40,11 @@ case "$OS" in PS=";" FS="\\" ;; + CYGWIN_* ) + NULL=/dev/null + PS=";" + FS="/" + ;; * ) echo "Unrecognized system!" exit 1; diff --git a/test/runtime/7051189/Xchecksig.sh b/test/runtime/7051189/Xchecksig.sh index b4fbbd7d7..f3eabce57 100644 --- a/test/runtime/7051189/Xchecksig.sh +++ b/test/runtime/7051189/Xchecksig.sh @@ -46,7 +46,7 @@ case "$OS" in SunOS | Linux | Darwin ) FS="/" ;; - Windows_* ) + Windows_* | CYGWIN_* ) printf "Not testing libjsig.so on Windows. PASSED.\n " exit 0 ;; diff --git a/test/runtime/7110720/Test7110720.sh b/test/runtime/7110720/Test7110720.sh index ef13888ee..0788cb56a 100644 --- a/test/runtime/7110720/Test7110720.sh +++ b/test/runtime/7110720/Test7110720.sh @@ -55,6 +55,12 @@ case "$OS" in CP=cp MV=mv ;; + CYGWIN_* ) + FS="/" + RM=rm + CP=cp + MV=mv + ;; * ) echo "Unrecognized system!" exit 1; diff --git a/test/runtime/7158800/Test7158800.sh b/test/runtime/7158800/Test7158800.sh index 781922a3c..81fa7aca8 100644 --- a/test/runtime/7158800/Test7158800.sh +++ b/test/runtime/7158800/Test7158800.sh @@ -56,6 +56,11 @@ case "$OS" in PS=";" FS="\\" ;; + CYGWIN_* ) + NULL=/dev/null + PS=";" + FS="/" + ;; * ) echo "Unrecognized system!" exit 1; diff --git a/test/runtime/7158988/TestFieldMonitor.sh b/test/runtime/7158988/TestFieldMonitor.sh index cf7fcf393..aa18c1609 100644 --- a/test/runtime/7158988/TestFieldMonitor.sh +++ b/test/runtime/7158988/TestFieldMonitor.sh @@ -38,6 +38,18 @@ case "$OS" in PS=";" FS="\\" ;; + CYGWIN_NT* ) + NULL=/dev/null + PS=";" + FS="/" + ;; + CYGWIN_* ) + NULL=/dev/null + PS=";" + FS="/" + echo "Test skipped, only for WinNT" + exit 0 + ;; * ) echo "Unrecognized system!" exit 1; -- GitLab