From 373b8ccd272c94f3320e1505dcf0079a06d564d3 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@oracle.com>
Date: Wed, 29 Aug 2012 14:49:05 -0400
Subject: [PATCH] 7191926: Remove MKS dependency in Hotspot regression tests

Add case for CYGWIN in .sh files.

Reviewed-by: coleenp, kvn
---
 hotspot/test/compiler/6894807/Test6894807.sh     |  5 +++++
 hotspot/test/gc/6941923/test6941923.sh           |  2 +-
 hotspot/test/runtime/6626217/Test6626217.sh      |  8 ++++++++
 hotspot/test/runtime/6878713/Test6878713.sh      |  5 +++++
 hotspot/test/runtime/7020373/Test7020373.sh      |  5 +++++
 hotspot/test/runtime/7051189/Xchecksig.sh        |  2 +-
 hotspot/test/runtime/7110720/Test7110720.sh      |  6 ++++++
 hotspot/test/runtime/7158800/Test7158800.sh      |  5 +++++
 hotspot/test/runtime/7158988/TestFieldMonitor.sh | 12 ++++++++++++
 9 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/hotspot/test/compiler/6894807/Test6894807.sh b/hotspot/test/compiler/6894807/Test6894807.sh
index 20fee43ea69..229fb545108 100644
--- a/hotspot/test/compiler/6894807/Test6894807.sh
+++ b/hotspot/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/hotspot/test/gc/6941923/test6941923.sh b/hotspot/test/gc/6941923/test6941923.sh
index e6641963568..0c751de12e0 100644
--- a/hotspot/test/gc/6941923/test6941923.sh
+++ b/hotspot/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/hotspot/test/runtime/6626217/Test6626217.sh b/hotspot/test/runtime/6626217/Test6626217.sh
index e7414983b9c..a8c8a2395cf 100644
--- a/hotspot/test/runtime/6626217/Test6626217.sh
+++ b/hotspot/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/hotspot/test/runtime/6878713/Test6878713.sh b/hotspot/test/runtime/6878713/Test6878713.sh
index 73d91fc0c32..a452ad58fcd 100644
--- a/hotspot/test/runtime/6878713/Test6878713.sh
+++ b/hotspot/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/hotspot/test/runtime/7020373/Test7020373.sh b/hotspot/test/runtime/7020373/Test7020373.sh
index 54b8b32974e..83e7f4c449d 100644
--- a/hotspot/test/runtime/7020373/Test7020373.sh
+++ b/hotspot/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/hotspot/test/runtime/7051189/Xchecksig.sh b/hotspot/test/runtime/7051189/Xchecksig.sh
index b4fbbd7d7c8..f3eabce57d5 100644
--- a/hotspot/test/runtime/7051189/Xchecksig.sh
+++ b/hotspot/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/hotspot/test/runtime/7110720/Test7110720.sh b/hotspot/test/runtime/7110720/Test7110720.sh
index ef13888ee57..0788cb56a58 100644
--- a/hotspot/test/runtime/7110720/Test7110720.sh
+++ b/hotspot/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/hotspot/test/runtime/7158800/Test7158800.sh b/hotspot/test/runtime/7158800/Test7158800.sh
index 781922a3c5b..81fa7aca8a8 100644
--- a/hotspot/test/runtime/7158800/Test7158800.sh
+++ b/hotspot/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/hotspot/test/runtime/7158988/TestFieldMonitor.sh b/hotspot/test/runtime/7158988/TestFieldMonitor.sh
index cf7fcf39319..aa18c1609ba 100644
--- a/hotspot/test/runtime/7158988/TestFieldMonitor.sh
+++ b/hotspot/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;