6954517: Testcase failure tools/launcher/UnicodeTest.sh
authorohair
Wed, 07 Jul 2010 10:17:36 -0700
changeset 5999 035006c50f21
parent 5998 586c1b1dbb10
child 6000 b794e7305478
child 6870 8d29f1358572
6954517: Testcase failure tools/launcher/UnicodeTest.sh Reviewed-by: ksrini
jdk/test/tools/launcher/UnicodeTest.sh
--- a/jdk/test/tools/launcher/UnicodeTest.sh	Tue Jul 06 18:58:30 2010 -0700
+++ b/jdk/test/tools/launcher/UnicodeTest.sh	Wed Jul 07 10:17:36 2010 -0700
@@ -54,7 +54,11 @@
 
 echo "creating test source files"
 "$JAVAC" -d . "${TESTSRC}"/UnicodeTest.java
-CLASS_NAME=`"$JAVA" UnicodeTest | sed -e 's@\\r@@g' `
+if [ "`uname -s | grep CYGWIN`" != "" ] ; then
+  CLASS_NAME=`"$JAVA" UnicodeTest | sed -e 's@\\r@@g' `
+else
+  CLASS_NAME=`"$JAVA" UnicodeTest`
+fi
 
 if [ "$CLASS_NAME" = "" ]
 then