infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-09 14:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

6941287: 4/4 jrunscriptTest.sh test does not work right under Cygwin

Browse Source 
Add golden_diff variable for doing proper golden file diffs on Cygwin.

Reviewed-by: ohair, dholmes
This commit is contained in:
Daniel D. Daugherty 2010-07-21 16:58:35 -07:00
parent 11b424e02b
commit 5d8f395e2b
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/test/sun/tools/jrunscript/common.sh
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2010, 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
@ -43,10 +43,20 @@ setup() {
Windows_*)
PS=";"
FS="\\"
# MKS diff deals with trailing CRs automatically
golden_diff="diff"
;;
CYGWIN*)
PS=":"
FS="/"
# Cygwin diff needs to be told to ignore trailing CRs
golden_diff="diff --strip-trailing-cr"
;;
*)
PS=":"
FS="/"
# Assume any other platform doesn't have the trailing CR stuff
golden_diff="diff"
;;
esac

6
jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2010, 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
@ -42,7 +42,7 @@ fi
rm -f jrunscript-eTest.out 2>/dev/null
${JRUNSCRIPT} -e "println('hello')" > jrunscript-eTest.out 2>&1
diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
if [ $? != 0 ]
then
echo "Output of jrunscript -e differ from expected output. Failed."
@ -55,7 +55,7 @@ fi
rm -f jrunscript-eTest.out 2>/dev/null
${JRUNSCRIPT} -l js -e "println('hello')" > jrunscript-eTest.out 2>&1
diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
if [ $? != 0 ]
then
echo "Output of jrunscript -e differ from expected output. Failed."

6
jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2010, 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
@ -42,7 +42,7 @@ fi
rm -f jrunscript-fTest.out 2>/dev/null
${JRUNSCRIPT} -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
if [ $? != 0 ]
then
echo "Output of jrunscript -f differ from expected output. Failed."
@ -56,7 +56,7 @@ fi
rm -f jrunscript-fTest.out 2>/dev/null
${JRUNSCRIPT} -l js -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
if [ $? != 0 ]
then
echo "Output of jrunscript -f differ from expected output. Failed."

6
jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2010, 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
@ -49,7 +49,7 @@ java.lang.System.out.println('hello world from script');
new java.lang.Runnable() { run: function() { println('I am runnable'); }}.run();
EOF
diff jrunscriptTest.out ${TESTSRC}/repl.out
$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
if [ $? != 0 ]
then
echo "Output of jrunscript session differ from expected output. Failed."
@ -67,7 +67,7 @@ java.lang.System.out.println('hello world from script');
new java.lang.Runnable() { run: function() { println('I am runnable'); }}.run();
EOF
diff jrunscriptTest.out ${TESTSRC}/repl.out
$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
if [ $? != 0 ]
then
echo "Output of jrunscript -l js differ from expected output. Failed."