From 399194bb7a06b0c9c7d0dc4457fbf3454e9592df Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Fri, 24 Feb 2012 20:02:50 +0100
Subject: [PATCH] 7073626: RmiBootstrapTest.sh and RmiSslBootstrapTest.sh fail
 under Cygwin

Detect and handle cygwin correctly

Reviewed-by: alanb, sspitsyn
---
 jdk/test/ProblemList.txt                                 | 3 ---
 .../jmxremote/bootstrap/GeneratePropertyPassword.sh      | 9 ++++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index b75084eb97e..2d284667df2 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -144,9 +144,6 @@ javax/management/loading/LibraryLoader/LibraryLoaderTest.java	windows-all
 # 7144846
 javax/management/remote/mandatory/connection/ReconnectTest.java	generic-all
 
-# 7073626
-sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh          windows-all
-sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh       windows-all
 
 ############################################################################
 
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh b/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
index eef07a28655..bfb3b0d6b4f 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
+++ b/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,13 @@
 OS=`uname -s`
 UMASK=`umask`
 
+if [[ $OS == CYGWIN_NT* ]] ; then
+    OS="Windows_NT"
+    if [ -z "$SystemRoot" ] ;  then
+	SystemRoot=$SYSTEMROOT
+    fi
+fi
+
 case $OS in
 SunOS | Linux)
     PATHSEP=":"