1.1 --- a/test/tools/javac/versions/check.sh Wed May 20 13:36:23 2009 -0700
1.2 +++ b/test/tools/javac/versions/check.sh Wed May 20 19:10:06 2009 -0700
1.3 @@ -24,9 +24,8 @@
1.4 # @test
1.5 # @bug 4981566 5028634 5094412 6304984
1.6 # @summary Check interpretation of -target and -source options
1.7 -#
1.8 # @build CheckClassFileVersion
1.9 -# @run shell check.sh
1.10 +# @run shell check.sh
1.11
1.12 TESTJAVA=${TESTJAVA:?}
1.13 TC=${TESTCLASSES-.}
1.14 @@ -48,19 +47,26 @@
1.15 $JC ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && $CFV $TC/X.class $V || exit 2
1.16 }
1.17
1.18 -check 50.0
1.19 check 48.0 -source 1.4
1.20 +
1.21 check 49.0 -source 1.4 -target 1.5
1.22 -check 49.0 -target 1.5
1.23 -check 50.0 -source 1.5
1.24 -check 50.0 -target 1.6
1.25 -check 50.0 -target 6
1.26 -check 50.0 -source 1.6
1.27 -check 50.0 -source 6
1.28 +check 49.0 -source 1.5 -target 1.5
1.29 +
1.30 +check 50.0 -source 1.4 -target 1.6
1.31 +check 50.0 -source 1.5 -target 1.6
1.32 +check 50.0 -source 1.6 -target 1.6
1.33 +check 50.0 -source 1.6 -target 6
1.34 +check 50.0 -source 6 -target 1.6
1.35 +check 50.0 -source 6 -target 6
1.36 +
1.37 +check 51.0
1.38 +check 51.0 -source 1.5
1.39 +check 51.0 -source 1.6
1.40 +check 51.0 -source 6
1.41 +check 51.0 -source 1.7
1.42 +check 51.0 -source 7
1.43 check 51.0 -target 1.7
1.44 check 51.0 -target 7
1.45 -check 51.0 -source 1.7
1.46 -check 51.0 -source 7
1.47
1.48
1.49 # Check source versions
1.50 @@ -85,21 +91,30 @@
1.51 fi
1.52 }
1.53
1.54 +# the following need to be updated when -source 7 features are available
1.55 checksrc14() { pass $* $TC/X.java; fail $* $TC/Y.java; }
1.56 checksrc15() { pass $* $TC/X.java; pass $* $TC/Y.java; }
1.57 checksrc16() { checksrc15 $* ; }
1.58 +checksrc17() { checksrc15 $* ; }
1.59
1.60 checksrc14 -source 1.4
1.61 checksrc14 -source 1.4 -target 1.5
1.62
1.63 -checksrc15
1.64 -checksrc15 -target 1.5
1.65 checksrc15 -source 1.5
1.66 +checksrc15 -source 1.5 -target 1.5
1.67
1.68 -checksrc16 -target 1.6
1.69 -checksrc16 -target 6
1.70 checksrc16 -source 1.6
1.71 checksrc16 -source 6
1.72 +checksrc16 -source 1.6 -target 1.6
1.73 +checksrc16 -source 6 -target 6
1.74 +
1.75 +checksrc17
1.76 +checksrc17 -target 1.7
1.77 +checksrc17 -target 7
1.78 +checksrc17 -source 1.7
1.79 +checksrc17 -source 7
1.80 +checksrc17 -source 1.7 -target 1.7
1.81 +checksrc17 -source 7 -target 7
1.82
1.83 fail -source 1.5 -target 1.4 $TC/X.java
1.84 fail -source 1.6 -target 1.4 $TC/X.java
