archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6581775: Fix the white space problem in javac shell tests

Browse source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2011-01-24 16:34:25 -08:00
parent 1d1fd8962d
commit 1ab227adc4
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
View file

@ -100,7 +100,7 @@ testJavac() {
expectedResult="$1"; shift expectedResult="$1"; shift
cleanup cleanup
echo $javac ${TESTTOOLVMOPTS} "$@" echo $javac ${TESTTOOLVMOPTS} "$@"
$javac ${TESTTOOLVMOPTS} "$@" "$javac" ${TESTTOOLVMOPTS} "$@"
report $expectedResult $? report $expectedResult $?
} }

6
langtools/test/tools/javac/ExtDirs/ExtDirs.sh
View file

@ -85,15 +85,15 @@ for i in 1 2 3; do
done done
echo "Test 1" echo "Test 1"
$javac ${TESTTOOLVMOPTS} -d . -extdirs ext1 "${TESTSRC}${FS}ExtDirTest_1.java" "$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1 "${TESTSRC}${FS}ExtDirTest_1.java"
if [ $? -ne 0 ] ; then fail ; fi if [ $? -ne 0 ] ; then fail ; fi
echo "Test 2" echo "Test 2"
$javac ${TESTTOOLVMOPTS} -d . -extdirs ext1${PS}ext2 "${TESTSRC}${FS}ExtDirTest_2.java" "$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1${PS}ext2 "${TESTSRC}${FS}ExtDirTest_2.java"
if [ $? -ne 0 ] ; then fail ; fi if [ $? -ne 0 ] ; then fail ; fi
echo "Test 3" echo "Test 3"
$javac ${TESTTOOLVMOPTS} -d . -extdirs ext3 "${TESTSRC}${FS}ExtDirTest_3.java" "$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext3 "${TESTSRC}${FS}ExtDirTest_3.java"
if [ $? -ne 0 ] ; then fail ; fi if [ $? -ne 0 ] ; then fail ; fi
echo PASS: all tests gave expected results echo PASS: all tests gave expected results

4
langtools/test/tools/javac/Paths/Help.sh
View file

@ -40,8 +40,8 @@ set -u
DiagnosticsInEnglishPlease DiagnosticsInEnglishPlease
HELP="`$javac ${TESTTOOLVMOPTS} -help 2>&1`" HELP="`\"$javac\" ${TESTTOOLVMOPTS} -help 2>&1`"
XHELP="`$javac ${TESTTOOLVMOPTS} -X 2>&1`" XHELP="`\"$javac\" ${TESTTOOLVMOPTS} -X 2>&1`"
#---------------------------------------------------------------- #----------------------------------------------------------------
# Standard options # Standard options

4
langtools/test/tools/javac/javazip/Test.sh
View file

@ -66,8 +66,8 @@ check() {
# clean old classes # clean old classes
rm -f ${TC}${FS}*.class rm -f ${TC}${FS}*.class
echo "$*" echo "$@"
if $* 2>&1 ; then if "$@" 2>&1 ; then
actual=ok actual=ok
else else
actual=err actual=err

8
langtools/test/tools/javac/versions/check.sh
View file

@ -32,7 +32,7 @@ TC=${TESTCLASSES-.}
J="$TESTJAVA/bin/java" J="$TESTJAVA/bin/java"
JC="$TESTJAVA/bin/javac" JC="$TESTJAVA/bin/javac"
CFV="$J ${TESTVMOPTS} -cp $TC CheckClassFileVersion" CFV="${TESTVMOPTS} -cp $TC CheckClassFileVersion"
rm -f $TC/X.java $TC/X.java rm -f $TC/X.java $TC/X.java
echo 'public class X { }' > $TC/X.java echo 'public class X { }' > $TC/X.java
@ -44,7 +44,7 @@ echo 'public enum Y { }' > $TC/Y.java
check() { check() {
V=$1; shift V=$1; shift
echo "+ javac $* [$V]" echo "+ javac $* [$V]"
$JC ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && $CFV $TC/X.class $V || exit 2 "$JC" ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && "$J" $CFV $TC/X.class $V || exit 2
} }
check 48.0 -source 1.4 check 48.0 -source 1.4
@ -73,7 +73,7 @@ check 51.0 -target 7
fail() { fail() {
echo "+ javac $*" echo "+ javac $*"
if $JC ${TESTTOOLVMOPTS} -d $TC $*; then if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then
echo "-- did not fail as expected" echo "-- did not fail as expected"
exit 3 exit 3
else else
@ -83,7 +83,7 @@ fail() {
pass() { pass() {
echo "+ javac $*" echo "+ javac $*"
if $JC ${TESTTOOLVMOPTS} -d $TC $*; then if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then
echo "-- passed" echo "-- passed"
else else
echo "-- failed" echo "-- failed"