From 17f17157b9162fa2d2dc8522d2b26b98cd54c02c Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Fri, 24 Feb 2012 20:09:49 +0100
Subject: [PATCH] 7079093: TEST_BUG: java/lang/instrument/ManifestTest.sh fails
 with cygwin

Work around problems in some cygwin installations

Reviewed-by: alanb, sspitsyn
---
 jdk/test/ProblemList.txt                      |  5 +----
 jdk/test/java/lang/instrument/ManifestTest.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 2d284667df2..9e18b8105c3 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -125,9 +125,6 @@
 # 7123972
 java/lang/annotation/loaderLeak/Main.java			generic-all
 
-# 7079093
-java/lang/instrument/ManifestTest.sh                            windows-all
-
 # 6944188
 java/lang/management/ThreadMXBean/ThreadStateTest.java          generic-all
 
diff --git a/jdk/test/java/lang/instrument/ManifestTest.sh b/jdk/test/java/lang/instrument/ManifestTest.sh
index b10e2352da4..4fbd51af158 100644
--- a/jdk/test/java/lang/instrument/ManifestTest.sh
+++ b/jdk/test/java/lang/instrument/ManifestTest.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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
@@ -396,7 +396,7 @@ while read token; do
         touch $FAIL_MARKER
     fi
 
-    MESG=`cat expect_boot_cp_line`
+    MESG=`cat expect_boot_cp_line | tr -d '\n\r'`
     grep -s "$MESG" output.log > /dev/null
     result=$?
     if [ "$result" = 0 ]; then
@@ -406,7 +406,7 @@ while read token; do
         touch $FAIL_MARKER
     fi
 
-    MESG=`cat expect_redef_line`
+    MESG=`cat expect_redef_line | tr -d '\n\r'`
     grep -s "$MESG" output.log > /dev/null
     result=$?
     if [ "$result" = 0 ]; then
@@ -416,7 +416,7 @@ while read token; do
         touch $FAIL_MARKER
     fi
 
-    MESG=`cat expect_retrans_line`
+    MESG=`cat expect_retrans_line | tr -d '\n\r'`
     grep -s "$MESG" output.log > /dev/null
     result=$?
     if [ "$result" = 0 ]; then
@@ -426,7 +426,7 @@ while read token; do
         touch $FAIL_MARKER
     fi
 
-    MESG=`cat expect_set_nmp_line`
+    MESG=`cat expect_set_nmp_line | tr -d '\n\r'`
     grep -s "$MESG" output.log > /dev/null
     result=$?
     if [ "$result" = 0 ]; then