changeset 5085:585f2c72d042

7073626: RmiBootstrapTest.sh and RmiSslBootstrapTest.sh fail under Cygwin Summary: Detect and handle cygwin correctly Reviewed-by: alanb, sspitsyn
author sla
date Fri, 24 Feb 2012 20:02:50 +0100
parents 0a350fb8b174
children 4893a89b4916
files test/ProblemList.txt test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/ProblemList.txt	Fri Feb 24 09:17:46 2012 +0000
+++ b/test/ProblemList.txt	Fri Feb 24 20:02:50 2012 +0100
@@ -144,9 +144,6 @@
 # 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
 
 ############################################################################
 
--- a/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Feb 24 09:17:46 2012 +0000
+++ b/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Feb 24 20:02:50 2012 +0100
@@ -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=":"