diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/disabled/pos/spec-traits.scala (renamed from test/files/pos/spec-traits.scala) | 0 | ||||
-rw-r--r-- | test/disabled/pos/t1254/t1254.java (renamed from test/files/pos/t1254/t1254.java) | 0 | ||||
-rw-r--r-- | test/disabled/run/stream_length.check | 1 | ||||
-rw-r--r-- | test/disabled/run/stream_length.scala (renamed from test/files/run/stream_length.scala) | 0 | ||||
-rw-r--r-- | test/disabled/run/t2946/Parsers.scala (renamed from test/files/run/t2946/Parsers.scala) | 0 | ||||
-rw-r--r-- | test/disabled/run/t2946/ResponseCommon.scala (renamed from test/files/run/t2946/ResponseCommon.scala) | 0 | ||||
-rw-r--r-- | test/disabled/run/t2946/Test.scala (renamed from test/files/run/t2946/Test.scala) | 0 | ||||
-rw-r--r-- | test/disabled/scalacheck/redblack.scala (renamed from test/files/scalacheck/redblack.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/function0.check (renamed from test/continuations/neg/function0.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/function0.scala (renamed from test/continuations/neg/function0.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/function2.check (renamed from test/continuations/neg/function2.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/function2.scala (renamed from test/continuations/neg/function2.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/function3.check (renamed from test/continuations/neg/function3.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/function3.scala (renamed from test/continuations/neg/function3.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/infer0.check (renamed from test/continuations/neg/infer0.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/infer0.scala (renamed from test/continuations/neg/infer0.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/infer2.check (renamed from test/continuations/neg/infer2.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/infer2.scala (renamed from test/continuations/neg/infer2.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/lazy.check (renamed from test/continuations/neg/lazy.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/lazy.scala (renamed from test/continuations/neg/lazy.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/t1929.check (renamed from test/continuations/neg/t1929.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/t1929.scala (renamed from test/continuations/neg/t1929.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/t2285.check (renamed from test/continuations/neg/t2285.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/t2285.scala (renamed from test/continuations/neg/t2285.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/t2949.check (renamed from test/continuations/neg/t2949.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/t2949.scala (renamed from test/continuations/neg/t2949.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/trycatch2.check (renamed from test/continuations/neg/trycatch2.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-neg/trycatch2.scala (renamed from test/continuations/neg/trycatch2.scala) | 0 | ||||
-rwxr-xr-x | test/files/continuations-run/basics.check (renamed from test/continuations/run/basics.check) | 0 | ||||
-rwxr-xr-x | test/files/continuations-run/basics.scala (renamed from test/continuations/run/basics.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function1.check (renamed from test/continuations/run/function1.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function1.scala (renamed from test/continuations/run/function1.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function4.check (renamed from test/continuations/run/function4.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function4.scala (renamed from test/continuations/run/function4.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function5.check (renamed from test/continuations/run/function5.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function5.scala (renamed from test/continuations/run/function5.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function6.check (renamed from test/continuations/run/function6.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/function6.scala (renamed from test/continuations/run/function6.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse0.check (renamed from test/continuations/run/ifelse0.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse0.scala (renamed from test/continuations/run/ifelse0.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse1.check (renamed from test/continuations/run/ifelse1.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse1.scala (renamed from test/continuations/run/ifelse1.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse2.check (renamed from test/continuations/run/ifelse2.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse2.scala (renamed from test/continuations/run/ifelse2.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse3.check (renamed from test/continuations/run/ifelse3.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/ifelse3.scala (renamed from test/continuations/run/ifelse3.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/infer1.scala (renamed from test/continuations/run/infer1.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/match0.check (renamed from test/continuations/run/match0.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/match0.scala (renamed from test/continuations/run/match0.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/match1.check (renamed from test/continuations/run/match1.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/match1.scala (renamed from test/continuations/run/match1.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/match2.check (renamed from test/continuations/run/match2.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/match2.scala (renamed from test/continuations/run/match2.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t1807.check (renamed from test/continuations/run/t1807.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t1807.scala (renamed from test/continuations/run/t1807.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t1808.scala (renamed from test/continuations/run/t1808.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t1820.scala (renamed from test/continuations/run/t1820.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t1821.check (renamed from test/continuations/run/t1821.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t1821.scala (renamed from test/continuations/run/t1821.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t2864.check (renamed from test/continuations/run/t2864.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t2864.scala (renamed from test/continuations/run/t2864.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t2934.check (renamed from test/continuations/run/t2934.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t2934.scala (renamed from test/continuations/run/t2934.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3199.check (renamed from test/continuations/run/t3199.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3199.scala (renamed from test/continuations/run/t3199.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3199b.check (renamed from test/continuations/run/t3199b.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3199b.scala (renamed from test/continuations/run/t3199b.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3223.check (renamed from test/continuations/run/t3223.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3223.scala (renamed from test/continuations/run/t3223.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3225.check (renamed from test/continuations/run/t3225.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/t3225.scala (renamed from test/continuations/run/t3225.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/trycatch0.check (renamed from test/continuations/run/trycatch0.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/trycatch0.scala (renamed from test/continuations/run/trycatch0.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/trycatch1.check (renamed from test/continuations/run/trycatch1.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/trycatch1.scala (renamed from test/continuations/run/trycatch1.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/while0.check (renamed from test/continuations/run/while0.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/while0.scala (renamed from test/continuations/run/while0.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/while1.check (renamed from test/continuations/run/while1.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/while1.scala (renamed from test/continuations/run/while1.scala) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/while2.check (renamed from test/continuations/run/while2.check) | 0 | ||||
-rw-r--r-- | test/files/continuations-run/while2.scala (renamed from test/continuations/run/while2.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/genericNest.scala (renamed from test/files/jvm/genericNest/genericNest.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/methvsfield.java | 11 | ||||
-rw-r--r-- | test/files/jvm/methvsfield.scala | 4 | ||||
-rw-r--r-- | test/files/jvm/nest.java | 38 | ||||
-rw-r--r-- | test/files/jvm/nest.scala | 21 | ||||
-rw-r--r-- | test/files/jvm/outerEnum.scala (renamed from test/files/jvm/outerEnum/outerEnum.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/t1652.check | 2 | ||||
-rw-r--r-- | test/files/lib/annotations.jar.desired.sha1 (renamed from test/files/jvm/lib/annotations.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/lib/enums.jar.desired.sha1 (renamed from test/files/jvm/outerEnum/enums.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/lib/genericNest.jar.desired.sha1 (renamed from test/files/jvm/genericNest/genericNest.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/lib/methvsfield.jar.desired.sha1 | 1 | ||||
-rw-r--r-- | test/files/lib/nest.jar.desired.sha1 (renamed from test/files/jvm/lib/nest.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/lib/scalacheck.jar.desired.sha1 | 1 | ||||
-rw-r--r-- | test/files/neg/bug414.scala | 2 | ||||
-rw-r--r-- | test/files/neg/migration28.check | 3 | ||||
-rw-r--r-- | test/files/res/bug687.check | 5 | ||||
-rw-r--r-- | test/files/run/numbereq.scala | 2 | ||||
-rw-r--r-- | test/files/run/programmatic-main.check | 2 | ||||
-rwxr-xr-x | test/partest | 25 | ||||
-rwxr-xr-x | test/partest.bat | 4 | ||||
-rw-r--r-- | test/pending/jvm/t1464.check | 1 | ||||
-rw-r--r-- | test/pending/pos/t0644.scala | 11 | ||||
-rw-r--r-- | test/pending/run/bug2365/Test.scala | 35 | ||||
-rw-r--r-- | test/pending/run/bug2365/bug2365.javaopts | 1 | ||||
-rwxr-xr-x | test/pending/run/bug2365/run | 13 | ||||
-rw-r--r-- | test/pending/run/subarray.check | 2 |
107 files changed, 157 insertions, 28 deletions
diff --git a/test/files/pos/spec-traits.scala b/test/disabled/pos/spec-traits.scala index 9e339a14ad..9e339a14ad 100644 --- a/test/files/pos/spec-traits.scala +++ b/test/disabled/pos/spec-traits.scala diff --git a/test/files/pos/t1254/t1254.java b/test/disabled/pos/t1254/t1254.java index 25b733cf28..25b733cf28 100644 --- a/test/files/pos/t1254/t1254.java +++ b/test/disabled/pos/t1254/t1254.java diff --git a/test/disabled/run/stream_length.check b/test/disabled/run/stream_length.check new file mode 100644 index 0000000000..9906de773c --- /dev/null +++ b/test/disabled/run/stream_length.check @@ -0,0 +1 @@ +Length: 970299 diff --git a/test/files/run/stream_length.scala b/test/disabled/run/stream_length.scala index 68e9cad5ac..68e9cad5ac 100644 --- a/test/files/run/stream_length.scala +++ b/test/disabled/run/stream_length.scala diff --git a/test/files/run/t2946/Parsers.scala b/test/disabled/run/t2946/Parsers.scala index c0961034c4..c0961034c4 100644 --- a/test/files/run/t2946/Parsers.scala +++ b/test/disabled/run/t2946/Parsers.scala diff --git a/test/files/run/t2946/ResponseCommon.scala b/test/disabled/run/t2946/ResponseCommon.scala index fa9d8acccb..fa9d8acccb 100644 --- a/test/files/run/t2946/ResponseCommon.scala +++ b/test/disabled/run/t2946/ResponseCommon.scala diff --git a/test/files/run/t2946/Test.scala b/test/disabled/run/t2946/Test.scala index e9d9896a0e..e9d9896a0e 100644 --- a/test/files/run/t2946/Test.scala +++ b/test/disabled/run/t2946/Test.scala diff --git a/test/files/scalacheck/redblack.scala b/test/disabled/scalacheck/redblack.scala index 0334c1218d..0334c1218d 100644 --- a/test/files/scalacheck/redblack.scala +++ b/test/disabled/scalacheck/redblack.scala diff --git a/test/continuations/neg/function0.check b/test/files/continuations-neg/function0.check index 0a66763a0f..0a66763a0f 100644 --- a/test/continuations/neg/function0.check +++ b/test/files/continuations-neg/function0.check diff --git a/test/continuations/neg/function0.scala b/test/files/continuations-neg/function0.scala index 4112ee3835..4112ee3835 100644 --- a/test/continuations/neg/function0.scala +++ b/test/files/continuations-neg/function0.scala diff --git a/test/continuations/neg/function2.check b/test/files/continuations-neg/function2.check index 4833057652..4833057652 100644 --- a/test/continuations/neg/function2.check +++ b/test/files/continuations-neg/function2.check diff --git a/test/continuations/neg/function2.scala b/test/files/continuations-neg/function2.scala index ae0fda509d..ae0fda509d 100644 --- a/test/continuations/neg/function2.scala +++ b/test/files/continuations-neg/function2.scala diff --git a/test/continuations/neg/function3.check b/test/files/continuations-neg/function3.check index 4705ad9ed9..4705ad9ed9 100644 --- a/test/continuations/neg/function3.check +++ b/test/files/continuations-neg/function3.check diff --git a/test/continuations/neg/function3.scala b/test/files/continuations-neg/function3.scala index 0c3f1667e5..0c3f1667e5 100644 --- a/test/continuations/neg/function3.scala +++ b/test/files/continuations-neg/function3.scala diff --git a/test/continuations/neg/infer0.check b/test/files/continuations-neg/infer0.check index 1dd072ef09..1dd072ef09 100644 --- a/test/continuations/neg/infer0.check +++ b/test/files/continuations-neg/infer0.check diff --git a/test/continuations/neg/infer0.scala b/test/files/continuations-neg/infer0.scala index 894d5228b1..894d5228b1 100644 --- a/test/continuations/neg/infer0.scala +++ b/test/files/continuations-neg/infer0.scala diff --git a/test/continuations/neg/infer2.check b/test/files/continuations-neg/infer2.check index 59eb670bc3..59eb670bc3 100644 --- a/test/continuations/neg/infer2.check +++ b/test/files/continuations-neg/infer2.check diff --git a/test/continuations/neg/infer2.scala b/test/files/continuations-neg/infer2.scala index a890ac1fc4..a890ac1fc4 100644 --- a/test/continuations/neg/infer2.scala +++ b/test/files/continuations-neg/infer2.scala diff --git a/test/continuations/neg/lazy.check b/test/files/continuations-neg/lazy.check index bfa44c59a4..bfa44c59a4 100644 --- a/test/continuations/neg/lazy.check +++ b/test/files/continuations-neg/lazy.check diff --git a/test/continuations/neg/lazy.scala b/test/files/continuations-neg/lazy.scala index dffc57ffa0..dffc57ffa0 100644 --- a/test/continuations/neg/lazy.scala +++ b/test/files/continuations-neg/lazy.scala diff --git a/test/continuations/neg/t1929.check b/test/files/continuations-neg/t1929.check index f42c3a1e15..f42c3a1e15 100644 --- a/test/continuations/neg/t1929.check +++ b/test/files/continuations-neg/t1929.check diff --git a/test/continuations/neg/t1929.scala b/test/files/continuations-neg/t1929.scala index 02eda9170d..02eda9170d 100644 --- a/test/continuations/neg/t1929.scala +++ b/test/files/continuations-neg/t1929.scala diff --git a/test/continuations/neg/t2285.check b/test/files/continuations-neg/t2285.check index d5dff6a4f2..d5dff6a4f2 100644 --- a/test/continuations/neg/t2285.check +++ b/test/files/continuations-neg/t2285.check diff --git a/test/continuations/neg/t2285.scala b/test/files/continuations-neg/t2285.scala index f3c7f4c89c..f3c7f4c89c 100644 --- a/test/continuations/neg/t2285.scala +++ b/test/files/continuations-neg/t2285.scala diff --git a/test/continuations/neg/t2949.check b/test/files/continuations-neg/t2949.check index dd9768807c..dd9768807c 100644 --- a/test/continuations/neg/t2949.check +++ b/test/files/continuations-neg/t2949.check diff --git a/test/continuations/neg/t2949.scala b/test/files/continuations-neg/t2949.scala index ce27c7c0e8..ce27c7c0e8 100644 --- a/test/continuations/neg/t2949.scala +++ b/test/files/continuations-neg/t2949.scala diff --git a/test/continuations/neg/trycatch2.check b/test/files/continuations-neg/trycatch2.check index 5ff2838bad..5ff2838bad 100644 --- a/test/continuations/neg/trycatch2.check +++ b/test/files/continuations-neg/trycatch2.check diff --git a/test/continuations/neg/trycatch2.scala b/test/files/continuations-neg/trycatch2.scala index 761cee52ac..761cee52ac 100644 --- a/test/continuations/neg/trycatch2.scala +++ b/test/files/continuations-neg/trycatch2.scala diff --git a/test/continuations/run/basics.check b/test/files/continuations-run/basics.check index 54c059fdcb..54c059fdcb 100755 --- a/test/continuations/run/basics.check +++ b/test/files/continuations-run/basics.check diff --git a/test/continuations/run/basics.scala b/test/files/continuations-run/basics.scala index 9df209b11c..9df209b11c 100755 --- a/test/continuations/run/basics.scala +++ b/test/files/continuations-run/basics.scala diff --git a/test/continuations/run/function1.check b/test/files/continuations-run/function1.check index 7f8f011eb7..7f8f011eb7 100644 --- a/test/continuations/run/function1.check +++ b/test/files/continuations-run/function1.check diff --git a/test/continuations/run/function1.scala b/test/files/continuations-run/function1.scala index 3b39722e3a..3b39722e3a 100644 --- a/test/continuations/run/function1.scala +++ b/test/files/continuations-run/function1.scala diff --git a/test/continuations/run/function4.check b/test/files/continuations-run/function4.check index c7930257df..c7930257df 100644 --- a/test/continuations/run/function4.check +++ b/test/files/continuations-run/function4.check diff --git a/test/continuations/run/function4.scala b/test/files/continuations-run/function4.scala index b73eedb02c..b73eedb02c 100644 --- a/test/continuations/run/function4.scala +++ b/test/files/continuations-run/function4.scala diff --git a/test/continuations/run/function5.check b/test/files/continuations-run/function5.check index c7930257df..c7930257df 100644 --- a/test/continuations/run/function5.check +++ b/test/files/continuations-run/function5.check diff --git a/test/continuations/run/function5.scala b/test/files/continuations-run/function5.scala index a689ccf243..a689ccf243 100644 --- a/test/continuations/run/function5.scala +++ b/test/files/continuations-run/function5.scala diff --git a/test/continuations/run/function6.check b/test/files/continuations-run/function6.check index c7930257df..c7930257df 100644 --- a/test/continuations/run/function6.check +++ b/test/files/continuations-run/function6.check diff --git a/test/continuations/run/function6.scala b/test/files/continuations-run/function6.scala index 1a2792370a..1a2792370a 100644 --- a/test/continuations/run/function6.scala +++ b/test/files/continuations-run/function6.scala diff --git a/test/continuations/run/ifelse0.check b/test/files/continuations-run/ifelse0.check index f8bc79860d..f8bc79860d 100644 --- a/test/continuations/run/ifelse0.check +++ b/test/files/continuations-run/ifelse0.check diff --git a/test/continuations/run/ifelse0.scala b/test/files/continuations-run/ifelse0.scala index e34b86ee84..e34b86ee84 100644 --- a/test/continuations/run/ifelse0.scala +++ b/test/files/continuations-run/ifelse0.scala diff --git a/test/continuations/run/ifelse1.check b/test/files/continuations-run/ifelse1.check index 86a3fbc0c1..86a3fbc0c1 100644 --- a/test/continuations/run/ifelse1.check +++ b/test/files/continuations-run/ifelse1.check diff --git a/test/continuations/run/ifelse1.scala b/test/files/continuations-run/ifelse1.scala index 2ccc1ed730..2ccc1ed730 100644 --- a/test/continuations/run/ifelse1.scala +++ b/test/files/continuations-run/ifelse1.scala diff --git a/test/continuations/run/ifelse2.check b/test/files/continuations-run/ifelse2.check index f97a95b08d..f97a95b08d 100644 --- a/test/continuations/run/ifelse2.check +++ b/test/files/continuations-run/ifelse2.check diff --git a/test/continuations/run/ifelse2.scala b/test/files/continuations-run/ifelse2.scala index 536e350190..536e350190 100644 --- a/test/continuations/run/ifelse2.scala +++ b/test/files/continuations-run/ifelse2.scala diff --git a/test/continuations/run/ifelse3.check b/test/files/continuations-run/ifelse3.check index 95b562c8e6..95b562c8e6 100644 --- a/test/continuations/run/ifelse3.check +++ b/test/files/continuations-run/ifelse3.check diff --git a/test/continuations/run/ifelse3.scala b/test/files/continuations-run/ifelse3.scala index 5dbd079d1c..5dbd079d1c 100644 --- a/test/continuations/run/ifelse3.scala +++ b/test/files/continuations-run/ifelse3.scala diff --git a/test/continuations/run/infer1.scala b/test/files/continuations-run/infer1.scala index a6c6c07215..a6c6c07215 100644 --- a/test/continuations/run/infer1.scala +++ b/test/files/continuations-run/infer1.scala diff --git a/test/continuations/run/match0.check b/test/files/continuations-run/match0.check index f8bc79860d..f8bc79860d 100644 --- a/test/continuations/run/match0.check +++ b/test/files/continuations-run/match0.check diff --git a/test/continuations/run/match0.scala b/test/files/continuations-run/match0.scala index bd36238d7f..bd36238d7f 100644 --- a/test/continuations/run/match0.scala +++ b/test/files/continuations-run/match0.scala diff --git a/test/continuations/run/match1.check b/test/files/continuations-run/match1.check index 73053d3f4f..73053d3f4f 100644 --- a/test/continuations/run/match1.check +++ b/test/files/continuations-run/match1.check diff --git a/test/continuations/run/match1.scala b/test/files/continuations-run/match1.scala index ea4e219666..ea4e219666 100644 --- a/test/continuations/run/match1.scala +++ b/test/files/continuations-run/match1.scala diff --git a/test/continuations/run/match2.check b/test/files/continuations-run/match2.check index cbf91349cc..cbf91349cc 100644 --- a/test/continuations/run/match2.check +++ b/test/files/continuations-run/match2.check diff --git a/test/continuations/run/match2.scala b/test/files/continuations-run/match2.scala index 8d4f04870f..8d4f04870f 100644 --- a/test/continuations/run/match2.scala +++ b/test/files/continuations-run/match2.scala diff --git a/test/continuations/run/t1807.check b/test/files/continuations-run/t1807.check index 56a6051ca2..56a6051ca2 100644 --- a/test/continuations/run/t1807.check +++ b/test/files/continuations-run/t1807.check diff --git a/test/continuations/run/t1807.scala b/test/files/continuations-run/t1807.scala index 278b3a9936..278b3a9936 100644 --- a/test/continuations/run/t1807.scala +++ b/test/files/continuations-run/t1807.scala diff --git a/test/continuations/run/t1808.scala b/test/files/continuations-run/t1808.scala index 125c7c1cdf..125c7c1cdf 100644 --- a/test/continuations/run/t1808.scala +++ b/test/files/continuations-run/t1808.scala diff --git a/test/continuations/run/t1820.scala b/test/files/continuations-run/t1820.scala index 893ddab6d1..893ddab6d1 100644 --- a/test/continuations/run/t1820.scala +++ b/test/files/continuations-run/t1820.scala diff --git a/test/continuations/run/t1821.check b/test/files/continuations-run/t1821.check index f7b76115db..f7b76115db 100644 --- a/test/continuations/run/t1821.check +++ b/test/files/continuations-run/t1821.check diff --git a/test/continuations/run/t1821.scala b/test/files/continuations-run/t1821.scala index 0d5fb553be..0d5fb553be 100644 --- a/test/continuations/run/t1821.scala +++ b/test/files/continuations-run/t1821.scala diff --git a/test/continuations/run/t2864.check b/test/files/continuations-run/t2864.check index d411bb7c1a..d411bb7c1a 100644 --- a/test/continuations/run/t2864.check +++ b/test/files/continuations-run/t2864.check diff --git a/test/continuations/run/t2864.scala b/test/files/continuations-run/t2864.scala index 7a2579e45c..7a2579e45c 100644 --- a/test/continuations/run/t2864.scala +++ b/test/files/continuations-run/t2864.scala diff --git a/test/continuations/run/t2934.check b/test/files/continuations-run/t2934.check index a92586538e..a92586538e 100644 --- a/test/continuations/run/t2934.check +++ b/test/files/continuations-run/t2934.check diff --git a/test/continuations/run/t2934.scala b/test/files/continuations-run/t2934.scala index a1b8ca9e04..a1b8ca9e04 100644 --- a/test/continuations/run/t2934.scala +++ b/test/files/continuations-run/t2934.scala diff --git a/test/continuations/run/t3199.check b/test/files/continuations-run/t3199.check index a065247b8c..a065247b8c 100644 --- a/test/continuations/run/t3199.check +++ b/test/files/continuations-run/t3199.check diff --git a/test/continuations/run/t3199.scala b/test/files/continuations-run/t3199.scala index 3fd2f1959a..3fd2f1959a 100644 --- a/test/continuations/run/t3199.scala +++ b/test/files/continuations-run/t3199.scala diff --git a/test/continuations/run/t3199b.check b/test/files/continuations-run/t3199b.check index b5d8bb58d9..b5d8bb58d9 100644 --- a/test/continuations/run/t3199b.check +++ b/test/files/continuations-run/t3199b.check diff --git a/test/continuations/run/t3199b.scala b/test/files/continuations-run/t3199b.scala index 950c584153..950c584153 100644 --- a/test/continuations/run/t3199b.scala +++ b/test/files/continuations-run/t3199b.scala diff --git a/test/continuations/run/t3223.check b/test/files/continuations-run/t3223.check index ec635144f6..ec635144f6 100644 --- a/test/continuations/run/t3223.check +++ b/test/files/continuations-run/t3223.check diff --git a/test/continuations/run/t3223.scala b/test/files/continuations-run/t3223.scala index 4e510178e6..4e510178e6 100644 --- a/test/continuations/run/t3223.scala +++ b/test/files/continuations-run/t3223.scala diff --git a/test/continuations/run/t3225.check b/test/files/continuations-run/t3225.check index df1a8a9ce4..df1a8a9ce4 100644 --- a/test/continuations/run/t3225.check +++ b/test/files/continuations-run/t3225.check diff --git a/test/continuations/run/t3225.scala b/test/files/continuations-run/t3225.scala index ecfde279cf..ecfde279cf 100644 --- a/test/continuations/run/t3225.scala +++ b/test/files/continuations-run/t3225.scala diff --git a/test/continuations/run/trycatch0.check b/test/files/continuations-run/trycatch0.check index 36806909d0..36806909d0 100644 --- a/test/continuations/run/trycatch0.check +++ b/test/files/continuations-run/trycatch0.check diff --git a/test/continuations/run/trycatch0.scala b/test/files/continuations-run/trycatch0.scala index 74a078b5ef..74a078b5ef 100644 --- a/test/continuations/run/trycatch0.scala +++ b/test/files/continuations-run/trycatch0.scala diff --git a/test/continuations/run/trycatch1.check b/test/files/continuations-run/trycatch1.check index a028d2b1e1..a028d2b1e1 100644 --- a/test/continuations/run/trycatch1.check +++ b/test/files/continuations-run/trycatch1.check diff --git a/test/continuations/run/trycatch1.scala b/test/files/continuations-run/trycatch1.scala index ade13794e3..ade13794e3 100644 --- a/test/continuations/run/trycatch1.scala +++ b/test/files/continuations-run/trycatch1.scala diff --git a/test/continuations/run/while0.check b/test/files/continuations-run/while0.check index d58c55a31d..d58c55a31d 100644 --- a/test/continuations/run/while0.check +++ b/test/files/continuations-run/while0.check diff --git a/test/continuations/run/while0.scala b/test/files/continuations-run/while0.scala index 9735f9d2c3..9735f9d2c3 100644 --- a/test/continuations/run/while0.scala +++ b/test/files/continuations-run/while0.scala diff --git a/test/continuations/run/while1.check b/test/files/continuations-run/while1.check index 3d5f0b9a46..3d5f0b9a46 100644 --- a/test/continuations/run/while1.check +++ b/test/files/continuations-run/while1.check diff --git a/test/continuations/run/while1.scala b/test/files/continuations-run/while1.scala index fb5dc0079a..fb5dc0079a 100644 --- a/test/continuations/run/while1.scala +++ b/test/files/continuations-run/while1.scala diff --git a/test/continuations/run/while2.check b/test/files/continuations-run/while2.check index 9fe515181b..9fe515181b 100644 --- a/test/continuations/run/while2.check +++ b/test/files/continuations-run/while2.check diff --git a/test/continuations/run/while2.scala b/test/files/continuations-run/while2.scala index f36288929e..f36288929e 100644 --- a/test/continuations/run/while2.scala +++ b/test/files/continuations-run/while2.scala diff --git a/test/files/jvm/genericNest/genericNest.scala b/test/files/jvm/genericNest.scala index c1b0210117..c1b0210117 100644 --- a/test/files/jvm/genericNest/genericNest.scala +++ b/test/files/jvm/genericNest.scala diff --git a/test/files/jvm/methvsfield.java b/test/files/jvm/methvsfield.java new file mode 100644 index 0000000000..dadc98669a --- /dev/null +++ b/test/files/jvm/methvsfield.java @@ -0,0 +1,11 @@ +// This should be compiled with javac and saved +// in ../lib/methvsfield.jar . +class MethVsField +{ + int three = 3; + + int three() + { + return 3; + } +} diff --git a/test/files/jvm/methvsfield.scala b/test/files/jvm/methvsfield.scala new file mode 100644 index 0000000000..e9795ec6a8 --- /dev/null +++ b/test/files/jvm/methvsfield.scala @@ -0,0 +1,4 @@ +// bug #1062 +object Test extends Application { + println((new MethVsField).three) +} diff --git a/test/files/jvm/nest.java b/test/files/jvm/nest.java new file mode 100644 index 0000000000..3f6f0bebbd --- /dev/null +++ b/test/files/jvm/nest.java @@ -0,0 +1,38 @@ +package nestpkg; + + +/** This file is needed for test 'nest.scala'. It should + * be compiled with javac and packaged into lib/nest.jar + */ +public class nest { + public static class best { + public static class rest { + public static rest test = new rest(); + public static int x = 10; + public int inc(int i) { + return i + 1; + } + } + } + + + String name = "Outer name"; + + public class Inn { + int x; + + public Inn(int x) { + this.x = x; + } + + public void doSomething() { + System.out.println("Inn " + name + " x: " + x); + } + } + + protected class ProtInn { + public void doSomething() { + System.out.println("ProtInn " + name); + } + } +} diff --git a/test/files/jvm/nest.scala b/test/files/jvm/nest.scala new file mode 100644 index 0000000000..3ab62484fa --- /dev/null +++ b/test/files/jvm/nest.scala @@ -0,0 +1,21 @@ +//############################################################################ +// Test Scala interaction with Java nested classes and static members. +//############################################################################ + +/** found in nest.jar, compiled from nest.java */ +import nestpkg._; + +object Test extends Application { + val x = nest.best.rest.test + Console.println(x.inc(1)) + + val o = new nest.best; + val r = new nest.best.rest; + Console.println(nest.best.rest.test.inc(2)) + Console.println(nest.best.rest.x) + + print("Instantiating public inner class: ") + val outer = new nest + val inn = new outer.Inn(42) + inn.doSomething +} diff --git a/test/files/jvm/outerEnum/outerEnum.scala b/test/files/jvm/outerEnum.scala index 18794b7dbe..18794b7dbe 100644 --- a/test/files/jvm/outerEnum/outerEnum.scala +++ b/test/files/jvm/outerEnum.scala diff --git a/test/files/jvm/t1652.check b/test/files/jvm/t1652.check new file mode 100644 index 0000000000..dfa480ce6e --- /dev/null +++ b/test/files/jvm/t1652.check @@ -0,0 +1,2 @@ +OK1 +OK2 diff --git a/test/files/jvm/lib/annotations.jar.desired.sha1 b/test/files/lib/annotations.jar.desired.sha1 index 2b4292d796..2b4292d796 100644 --- a/test/files/jvm/lib/annotations.jar.desired.sha1 +++ b/test/files/lib/annotations.jar.desired.sha1 diff --git a/test/files/jvm/outerEnum/enums.jar.desired.sha1 b/test/files/lib/enums.jar.desired.sha1 index 46cd8e92cf..46cd8e92cf 100644 --- a/test/files/jvm/outerEnum/enums.jar.desired.sha1 +++ b/test/files/lib/enums.jar.desired.sha1 diff --git a/test/files/jvm/genericNest/genericNest.jar.desired.sha1 b/test/files/lib/genericNest.jar.desired.sha1 index e9321262f2..e9321262f2 100644 --- a/test/files/jvm/genericNest/genericNest.jar.desired.sha1 +++ b/test/files/lib/genericNest.jar.desired.sha1 diff --git a/test/files/lib/methvsfield.jar.desired.sha1 b/test/files/lib/methvsfield.jar.desired.sha1 new file mode 100644 index 0000000000..8c01532b88 --- /dev/null +++ b/test/files/lib/methvsfield.jar.desired.sha1 @@ -0,0 +1 @@ +be8454d5e7751b063ade201c225dcedefd252775 ?methvsfield.jar diff --git a/test/files/jvm/lib/nest.jar.desired.sha1 b/test/files/lib/nest.jar.desired.sha1 index 674ca79a5b..674ca79a5b 100644 --- a/test/files/jvm/lib/nest.jar.desired.sha1 +++ b/test/files/lib/nest.jar.desired.sha1 diff --git a/test/files/lib/scalacheck.jar.desired.sha1 b/test/files/lib/scalacheck.jar.desired.sha1 new file mode 100644 index 0000000000..ed9c46c3db --- /dev/null +++ b/test/files/lib/scalacheck.jar.desired.sha1 @@ -0,0 +1 @@ +4c76385b1a9cb7cd619739776b940d98c4aadc6d ?scalacheck.jar diff --git a/test/files/neg/bug414.scala b/test/files/neg/bug414.scala index 7983fe88b9..2bc83eedcb 100644 --- a/test/files/neg/bug414.scala +++ b/test/files/neg/bug414.scala @@ -1,4 +1,4 @@ -case class Empty[a] extends IntMap[a]; +case class Empty[a]() extends IntMap[a]; case class Node[a](left: IntMap[a], keyVal: Pair[Int, a], right: IntMap[a]) extends IntMap[a]; abstract class IntMap[a] { def lookup(key: Int): a = this match { diff --git a/test/files/neg/migration28.check b/test/files/neg/migration28.check index 9e042a0f0b..4c8c58e0fd 100644 --- a/test/files/neg/migration28.check +++ b/test/files/neg/migration28.check @@ -1,5 +1,4 @@ -migration28.scala:5: error: method ++= in class Stack has changed semantics: -Stack ++= now pushes arguments on the stack from left to right. +migration28.scala:5: error: method ++= in class Stack is deprecated: use pushAll s ++= List(1,2,3) ^ migration28.scala:7: error: method foreach in class Stack has changed semantics: diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check index 353101c38b..ee9520d1ea 100644 --- a/test/files/res/bug687.check +++ b/test/files/res/bug687.check @@ -1,10 +1,11 @@ + nsc> -nsc> -bug687/QueryB.scala:3: error: name clash between defined and inherited member: +nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member: method equals:(o: java.lang.Object)Boolean and method equals:(x$1: Any)Boolean in class Any have same type after erasure: (o: java.lang.Object)Boolean override def equals(o : Object) = false; ^ + nsc> nsc> diff --git a/test/files/run/numbereq.scala b/test/files/run/numbereq.scala index 52f32cc52a..b07c83dc3e 100644 --- a/test/files/run/numbereq.scala +++ b/test/files/run/numbereq.scala @@ -33,7 +33,7 @@ object Test { val sets = setneg1 ++ setneg2 ++ List(zero) ++ setpos1 ++ setpos2 for (set <- sets ; x <- set ; y <- set) { - println("'%s' == '%s' (%s == %s) (%s == %s)".format(x, y, x.hashCode, y.hashCode, x.##, y.##)) + // println("'%s' == '%s' (%s == %s) (%s == %s)".format(x, y, x.hashCode, y.hashCode, x.##, y.##)) assert(x == y, "%s/%s != %s/%s".format(x, x.getClass, y, y.getClass)) assert(x.## == y.##, "%s != %s".format(x.getClass, y.getClass)) } diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 3429195265..e6c83a6f48 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -5,9 +5,7 @@ typer superaccessors pickler refchecks -selectiveanf liftcode -selectivecps uncurry tailcalls specialize diff --git a/test/partest b/test/partest index 87c7961689..1e7da8bd4a 100755 --- a/test/partest +++ b/test/partest @@ -75,23 +75,12 @@ if $cygwin; then fi # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris -[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xms64M -Xmx1024M -Xss768K -XX:MaxPermSize=96M" -[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="" +[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx512M -Xms16M" +[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" -# export SCALAC_OPTS -# export JAVA_OPTS -export JAVACMD - -${JAVACMD:=java} $JAVA_OPTS \ - -cp "$EXT_CLASSPATH" \ - -Dscala.home="${SCALA_HOME}" \ - scala.tools.partest.Runner "$@" +partestDebugStr="" +if [ ! -z "${PARTEST_DEBUG}" ] ; then + partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}" +fi -# ${JAVACMD:=java} $JAVA_OPTS \ -# -cp "$EXT_CLASSPATH" \ -# -Dscala.home="${SCALA_HOME}" \ -# -Dpartest.scalac_opts="${SCALAC_OPTS}" \ -# -Dpartest.javacmd="${JAVACMD}" \ -# -Dpartest.java_opts="${JAVA_OPTS}" \ -# -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" \ -# scala.tools.partest.Runner "$@" +${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" ${partestDebugStr} -Dscala.home="${SCALA_HOME}" -Dpartest.javacmd="${JAVACMD}" -Dpartest.java_opts="${JAVA_OPTS}" -Dpartest.scalac_opts="${SCALAC_OPTS}" -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@" diff --git a/test/partest.bat b/test/partest.bat index 0b5618a164..39fe830082 100755 --- a/test/partest.bat +++ b/test/partest.bat @@ -55,8 +55,8 @@ if "%_EXTENSION_CLASSPATH%"=="" ( set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%JAVA_HOME%\bin\javac"
-rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.Runner %_ARGS%
-%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.Runner %_ARGS%
+rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
+%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
goto end
rem ##########################################################################
diff --git a/test/pending/jvm/t1464.check b/test/pending/jvm/t1464.check new file mode 100644 index 0000000000..c508d5366f --- /dev/null +++ b/test/pending/jvm/t1464.check @@ -0,0 +1 @@ +false diff --git a/test/pending/pos/t0644.scala b/test/pending/pos/t0644.scala new file mode 100644 index 0000000000..5ad12c3632 --- /dev/null +++ b/test/pending/pos/t0644.scala @@ -0,0 +1,11 @@ +class A { + def appply(): Int = 0 + def update(n: Int) {} +} + +class B extends A { + this() + this()=1 + super() + super()=1 +} diff --git a/test/pending/run/bug2365/Test.scala b/test/pending/run/bug2365/Test.scala new file mode 100644 index 0000000000..92b58f4a25 --- /dev/null +++ b/test/pending/run/bug2365/Test.scala @@ -0,0 +1,35 @@ +import scala.tools.nsc.io._ +import java.net.URL + +object A { def apply(d: { def apply(): Int}) = d.apply() } +object A2 { def apply(d: { def apply(): Int}) = d.apply() } +object A3 { def apply(d: { def apply(): Int}) = d.apply() } +object A4 { def apply(d: { def apply(): Int}) = d.apply() } + +class B extends Function0[Int] { + def apply() = 3 +} + +object Test +{ + type StructF0 = { def apply(): Int } + def main(args: Array[String]) { + for(i <- 0 until 150) + println(i + " " + test(A.apply) + " " + test(A2.apply) + " " + test(A3.apply) + " " + test(A3.apply)) + } + + def test(withF0: StructF0 => Int): Int = { + // Some large jar + val ivyJar = File("/local/lib/java/ivy.jar").toURL + // load a class in a separate loader that will be passed to A + val loader = new java.net.URLClassLoader(Array(File(".").toURL, ivyJar)) + // load a real class to fill perm gen space + Class.forName("org.apache.ivy.Ivy", true, loader).newInstance + // create a class from another class loader with an apply: Int method + val b = Class.forName("B", true, loader).newInstance + + // pass instance to a, which will call apply using structural type reflection. + // This should hold on to the class for B, which means bLoader will not get collected + withF0(b.asInstanceOf[StructF0]) + } +} diff --git a/test/pending/run/bug2365/bug2365.javaopts b/test/pending/run/bug2365/bug2365.javaopts new file mode 100644 index 0000000000..357e033c1c --- /dev/null +++ b/test/pending/run/bug2365/bug2365.javaopts @@ -0,0 +1 @@ +-XX:MaxPermSize=25M diff --git a/test/pending/run/bug2365/run b/test/pending/run/bug2365/run new file mode 100755 index 0000000000..f3c44ad086 --- /dev/null +++ b/test/pending/run/bug2365/run @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This script should fail with any build of scala where #2365 +# is not fixed, and otherwise succeed. Failure means running out +# of PermGen space. + +CP=.:/local/lib/java/ivy.jar +# SCALAC=/scala/inst/28/bin/scalac +SCALAC=scalac +RUN_OPTS="-XX:MaxPermSize=25M -verbose:gc" + +$SCALAC -cp $CP *.scala +JAVA_OPTS="${RUN_OPTS}" scala -cp $CP Test diff --git a/test/pending/run/subarray.check b/test/pending/run/subarray.check new file mode 100644 index 0000000000..814f4a4229 --- /dev/null +++ b/test/pending/run/subarray.check @@ -0,0 +1,2 @@ +one +two |