diff options
-rw-r--r-- | lib/scalacheck.jar.desired.sha1 | 1 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.j9vm5 (renamed from test/files/cli/test1/Main.check.j9vm5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.java (renamed from test/files/cli/test1/Main.check.java) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.java5 (renamed from test/files/cli/test1/Main.check.java5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.java5_api (renamed from test/files/cli/test1/Main.check.java5_api) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.java5_j9 (renamed from test/files/cli/test1/Main.check.java5_j9) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.javac (renamed from test/files/cli/test1/Main.check.javac) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.javac5 (renamed from test/files/cli/test1/Main.check.javac5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.javac6 (renamed from test/files/cli/test1/Main.check.javac6) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.jikes (renamed from test/files/cli/test1/Main.check.jikes) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.jikes5 (renamed from test/files/cli/test1/Main.check.jikes5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.scala (renamed from test/files/cli/test1/Main.check.scala) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.scala_api (renamed from test/files/cli/test1/Main.check.scala_api) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.scala_j9 (renamed from test/files/cli/test1/Main.check.scala_j9) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.scalac (renamed from test/files/cli/test1/Main.check.scalac) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.check.scalaint (renamed from test/files/cli/test1/Main.check.scalaint) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.java (renamed from test/files/cli/test1/Main.java) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test1/Main.scala (renamed from test/files/cli/test1/Main.scala) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.j9vm5 (renamed from test/files/cli/test2/Main.check.j9vm5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.java (renamed from test/files/cli/test2/Main.check.java) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.java5 (renamed from test/files/cli/test2/Main.check.java5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.java5_api (renamed from test/files/cli/test2/Main.check.java5_api) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.java5_j9 (renamed from test/files/cli/test2/Main.check.java5_j9) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.javac (renamed from test/files/cli/test2/Main.check.javac) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.javac5 (renamed from test/files/cli/test2/Main.check.javac5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.javac6 (renamed from test/files/cli/test2/Main.check.javac6) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.jikes (renamed from test/files/cli/test2/Main.check.jikes) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.jikes5 (renamed from test/files/cli/test2/Main.check.jikes5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.scala (renamed from test/files/cli/test2/Main.check.scala) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.scala_api (renamed from test/files/cli/test2/Main.check.scala_api) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.scala_j9 (renamed from test/files/cli/test2/Main.check.scala_j9) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.scalac (renamed from test/files/cli/test2/Main.check.scalac) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.check.scalaint (renamed from test/files/cli/test2/Main.check.scalaint) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.java (renamed from test/files/cli/test2/Main.java) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test2/Main.scala (renamed from test/files/cli/test2/Main.scala) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.j9vm5 (renamed from test/files/cli/test3/Main.check.j9vm5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.java (renamed from test/files/cli/test3/Main.check.java) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.java5 (renamed from test/files/cli/test3/Main.check.java5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.java5_api (renamed from test/files/cli/test3/Main.check.java5_api) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.java5_j9 (renamed from test/files/cli/test3/Main.check.java5_j9) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.javac (renamed from test/files/cli/test3/Main.check.javac) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.javac5 (renamed from test/files/cli/test3/Main.check.javac5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.javac6 (renamed from test/files/cli/test3/Main.check.javac6) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.jikes (renamed from test/files/cli/test3/Main.check.jikes) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.jikes5 (renamed from test/files/cli/test3/Main.check.jikes5) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.scala (renamed from test/files/cli/test3/Main.check.scala) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.scala_api (renamed from test/files/cli/test3/Main.check.scala_api) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.scala_j9 (renamed from test/files/cli/test3/Main.check.scala_j9) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.scalac (renamed from test/files/cli/test3/Main.check.scalac) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.check.scalaint (renamed from test/files/cli/test3/Main.check.scalaint) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.java (renamed from test/files/cli/test3/Main.java) | 0 | ||||
-rw-r--r-- | test/attic/files/cli/test3/Main.scala (renamed from test/files/cli/test3/Main.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/function0.check (renamed from test/files/continuations-neg/function0.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/function0.scala (renamed from test/files/continuations-neg/function0.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/function2.check (renamed from test/files/continuations-neg/function2.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/function2.scala (renamed from test/files/continuations-neg/function2.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/function3.check (renamed from test/files/continuations-neg/function3.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/function3.scala (renamed from test/files/continuations-neg/function3.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/infer0.check (renamed from test/files/continuations-neg/infer0.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/infer0.scala (renamed from test/files/continuations-neg/infer0.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/infer2.check (renamed from test/files/continuations-neg/infer2.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/infer2.scala (renamed from test/files/continuations-neg/infer2.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/lazy.check (renamed from test/files/continuations-neg/lazy.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/lazy.scala (renamed from test/files/continuations-neg/lazy.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/t1929.check (renamed from test/files/continuations-neg/t1929.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/t1929.scala (renamed from test/files/continuations-neg/t1929.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/t2285.check (renamed from test/files/continuations-neg/t2285.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/t2285.scala (renamed from test/files/continuations-neg/t2285.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/t2949.check (renamed from test/files/continuations-neg/t2949.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/t2949.scala (renamed from test/files/continuations-neg/t2949.scala) | 0 | ||||
-rw-r--r-- | test/continuations/neg/trycatch2.check (renamed from test/files/continuations-neg/trycatch2.check) | 0 | ||||
-rw-r--r-- | test/continuations/neg/trycatch2.scala (renamed from test/files/continuations-neg/trycatch2.scala) | 0 | ||||
-rwxr-xr-x | test/continuations/run/basics.check (renamed from test/files/continuations-run/basics.check) | 0 | ||||
-rwxr-xr-x | test/continuations/run/basics.scala (renamed from test/files/continuations-run/basics.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/function1.check (renamed from test/files/continuations-run/function1.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/function1.scala (renamed from test/files/continuations-run/function1.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/function4.check (renamed from test/files/continuations-run/function4.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/function4.scala (renamed from test/files/continuations-run/function4.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/function5.check (renamed from test/files/continuations-run/function5.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/function5.scala (renamed from test/files/continuations-run/function5.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/function6.check (renamed from test/files/continuations-run/function6.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/function6.scala (renamed from test/files/continuations-run/function6.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse0.check (renamed from test/files/continuations-run/ifelse0.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse0.scala (renamed from test/files/continuations-run/ifelse0.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse1.check (renamed from test/files/continuations-run/ifelse1.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse1.scala (renamed from test/files/continuations-run/ifelse1.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse2.check (renamed from test/files/continuations-run/ifelse2.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse2.scala (renamed from test/files/continuations-run/ifelse2.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse3.check (renamed from test/files/continuations-run/ifelse3.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/ifelse3.scala (renamed from test/files/continuations-run/ifelse3.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/infer1.scala (renamed from test/files/continuations-run/infer1.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/match0.check (renamed from test/files/continuations-run/match0.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/match0.scala (renamed from test/files/continuations-run/match0.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/match1.check (renamed from test/files/continuations-run/match1.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/match1.scala (renamed from test/files/continuations-run/match1.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/match2.check (renamed from test/files/continuations-run/match2.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/match2.scala (renamed from test/files/continuations-run/match2.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t1807.check (renamed from test/files/continuations-run/t1807.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t1807.scala (renamed from test/files/continuations-run/t1807.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t1808.scala (renamed from test/files/continuations-run/t1808.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t1820.scala (renamed from test/files/continuations-run/t1820.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t1821.check (renamed from test/files/continuations-run/t1821.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t1821.scala (renamed from test/files/continuations-run/t1821.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t2864.check (renamed from test/files/continuations-run/t2864.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t2864.scala (renamed from test/files/continuations-run/t2864.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t2934.check (renamed from test/files/continuations-run/t2934.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t2934.scala (renamed from test/files/continuations-run/t2934.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3199.check (renamed from test/files/continuations-run/t3199.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3199.scala (renamed from test/files/continuations-run/t3199.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3199b.check (renamed from test/files/continuations-run/t3199b.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3199b.scala (renamed from test/files/continuations-run/t3199b.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3223.check (renamed from test/files/continuations-run/t3223.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3223.scala (renamed from test/files/continuations-run/t3223.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3225.check (renamed from test/files/continuations-run/t3225.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/t3225.scala (renamed from test/files/continuations-run/t3225.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/trycatch0.check (renamed from test/files/continuations-run/trycatch0.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/trycatch0.scala (renamed from test/files/continuations-run/trycatch0.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/trycatch1.check (renamed from test/files/continuations-run/trycatch1.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/trycatch1.scala (renamed from test/files/continuations-run/trycatch1.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/while0.check (renamed from test/files/continuations-run/while0.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/while0.scala (renamed from test/files/continuations-run/while0.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/while1.check (renamed from test/files/continuations-run/while1.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/while1.scala (renamed from test/files/continuations-run/while1.scala) | 0 | ||||
-rw-r--r-- | test/continuations/run/while2.check (renamed from test/files/continuations-run/while2.check) | 0 | ||||
-rw-r--r-- | test/continuations/run/while2.scala (renamed from test/files/continuations-run/while2.scala) | 0 | ||||
-rw-r--r-- | test/disabled-windows/script/loadAndExecute.check (renamed from test/files/script/loadAndExecute/loadAndExecute.check) | 0 | ||||
-rwxr-xr-x | test/disabled-windows/script/loadAndExecute/lAndE1.scala (renamed from test/files/script/loadAndExecute/lAndE1.scala) | 0 | ||||
-rwxr-xr-x | test/disabled-windows/script/loadAndExecute/lAndE2.scala (renamed from test/files/script/loadAndExecute/lAndE2.scala) | 0 | ||||
-rwxr-xr-x | test/disabled-windows/script/loadAndExecute/loadAndExecute.scala (renamed from test/files/script/loadAndExecute/loadAndExecute.scala) | 0 | ||||
-rwxr-xr-x | test/disabled-windows/script/utf8.bat (renamed from test/files/script/utf8.bat) | 0 | ||||
-rw-r--r-- | test/disabled-windows/script/utf8.check (renamed from test/files/script/utf8.check) | 0 | ||||
-rwxr-xr-x | test/disabled-windows/script/utf8.scala (renamed from test/files/script/utf8.scala) | 7 | ||||
-rw-r--r--[-rwxr-xr-x] | test/files/bench/equality/eqeq.eqlog (renamed from test/files/bench/equality/eqeq.log) | 0 | ||||
-rw-r--r-- | test/files/buildmanager/t2653/t2653.changes/A2.scala | 1 | ||||
-rw-r--r-- | test/files/files.iml | 17 | ||||
-rw-r--r-- | test/files/jvm/deprecation.cmds | 3 | ||||
-rw-r--r-- | test/files/jvm/genericNest/genericNest.jar.desired.sha1 (renamed from test/files/lib/genericNest.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/jvm/genericNest/genericNest.scala (renamed from test/files/jvm/genericNest.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/inner.scala | 2 | ||||
-rw-r--r-- | test/files/jvm/lib/annotations.jar.desired.sha1 (renamed from test/files/lib/annotations.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/jvm/lib/nest.jar.desired.sha1 (renamed from test/files/lib/nest.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 (renamed from test/files/lib/methvsfield.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/jvm/methvsfield/methvsfield.java (renamed from test/files/jvm/methvsfield.java) | 0 | ||||
-rw-r--r-- | test/files/jvm/methvsfield/methvsfield.scala (renamed from test/files/jvm/methvsfield.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/nest/nest.java (renamed from test/files/jvm/nest.java) | 0 | ||||
-rw-r--r-- | test/files/jvm/nest/nest.scala (renamed from test/files/jvm/nest.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/outerEnum/enums.jar.desired.sha1 (renamed from test/files/lib/enums.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/files/jvm/outerEnum/outerEnum.scala (renamed from test/files/jvm/outerEnum.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/t1652.check | 2 | ||||
-rw-r--r-- | test/files/jvm/t2470.cmds | 3 | ||||
-rw-r--r-- | test/files/jvm/t3003.cmds | 2 | ||||
-rw-r--r-- | test/files/jvm/unittest_io.scala | 2 | ||||
-rw-r--r-- | test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1 | 1 | ||||
-rw-r--r-- | test/files/neg/bug1279a.check | 6 | ||||
-rw-r--r-- | test/files/neg/bug414.check | 5 | ||||
-rw-r--r-- | test/files/neg/bug961.check | 5 | ||||
-rw-r--r-- | test/files/neg/bug961.scala | 6 | ||||
-rw-r--r-- | test/files/neg/migration28.check | 3 | ||||
-rw-r--r-- | test/files/neg/multi-array.flags | 1 | ||||
-rw-r--r-- | test/files/neg/t3115.flags | 2 | ||||
-rw-r--r-- | test/files/pos/bug715.cmds | 2 | ||||
-rw-r--r-- | test/files/pos/spec-partially.flags | 2 | ||||
-rw-r--r-- | test/files/pos/super.cmds | 2 | ||||
-rw-r--r-- | test/files/pos/switchUnbox.flags | 2 | ||||
-rw-r--r-- | test/files/pos/t0971.java | 4 | ||||
-rw-r--r-- | test/files/pos/t1029.cmds | 2 | ||||
-rw-r--r-- | test/files/pos/t1380.flags | 1 | ||||
-rw-r--r-- | test/files/pos/t1751.cmds | 3 | ||||
-rw-r--r-- | test/files/pos/t1782.cmds | 2 | ||||
-rw-r--r-- | test/files/pos/t1942.cmds | 2 | ||||
-rw-r--r-- | test/files/pos/t2464.cmds | 3 | ||||
-rw-r--r-- | test/files/pos/t2726.cmds | 2 | ||||
-rw-r--r-- | test/files/pos/t2868.cmds | 3 | ||||
-rw-r--r-- | test/files/pos/t294.cmds | 3 | ||||
-rw-r--r-- | test/files/res/bug687.check | 5 | ||||
-rw-r--r-- | test/files/run/arybufgrow.scala | 2 | ||||
-rw-r--r-- | test/files/run/bug594.scala | 2 | ||||
-rw-r--r-- | test/files/run/programmatic-main.check | 2 | ||||
-rw-r--r-- | test/files/run/regularpatmat.check | 126 | ||||
-rw-r--r-- | test/files/run/t2074.scala | 3 | ||||
-rw-r--r-- | test/files/run/t2074_2.scala | 2 | ||||
-rw-r--r-- | test/files/run/t2212.scala | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | test/files/run/t2946/Parsers.scala (renamed from test/disabled/run/t2946/Parsers.scala) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | test/files/run/t2946/ResponseCommon.scala (renamed from test/disabled/run/t2946/ResponseCommon.scala) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | test/files/run/t2946/Test.scala (renamed from test/disabled/run/t2946/Test.scala) | 0 | ||||
-rw-r--r-- | test/files/run/unittest_collection.scala | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | test/files/script/fact.scala | 0 | ||||
-rwxr-xr-x | test/partest | 25 | ||||
-rwxr-xr-x | test/partest.bat | 4 | ||||
-rw-r--r-- | test/pending/continuations-run/select-run.log | 20 | ||||
-rw-r--r-- | test/pending/jvm/t1464.check | 1 | ||||
-rw-r--r-- | test/pending/neg/bug1210.check (renamed from test/files/neg/bug1210.check) | 0 | ||||
-rw-r--r-- | test/pending/pos/t1380/gnujaxp.jar.desired.sha1 (renamed from test/files/pos/t1380/gnujaxp.jar.desired.sha1) | 0 | ||||
-rw-r--r-- | test/pending/pos/t1380/hallo.scala (renamed from test/files/pos/t1380/hallo.scala) | 0 | ||||
-rwxr-xr-x | test/pending/run/bug2365/run | 13 | ||||
-rw-r--r-- | test/pending/run/subarray.check | 2 | ||||
-rw-r--r-- | test/pending/script/bug2365.javaopts (renamed from test/pending/run/bug2365/bug2365.javaopts) | 0 | ||||
-rw-r--r-- | test/pending/script/bug2365/Test.scala (renamed from test/pending/run/bug2365/Test.scala) | 6 | ||||
-rwxr-xr-x | test/pending/script/bug2365/bug2365.scala | 9 | ||||
-rw-r--r-- | test/support/annotations/NestedAnnotations.java (renamed from test/files/jvm/NestedAnnotations.java) | 0 | ||||
-rw-r--r-- | test/support/annotations/OuterEnum.java (renamed from test/files/jvm/OuterEnum.java) | 0 | ||||
-rw-r--r-- | test/support/annotations/OuterTParams.java (renamed from test/files/jvm/OuterTParams.java) | 0 | ||||
-rw-r--r-- | test/support/annotations/SourceAnnotation.java (renamed from test/files/jvm/SourceAnnotation.java) | 0 | ||||
-rwxr-xr-x | test/support/annotations/mkAnnotationsJar.sh (renamed from test/files/jvm/mkAnnotationsJar.sh) | 0 |
204 files changed, 98 insertions, 238 deletions
diff --git a/lib/scalacheck.jar.desired.sha1 b/lib/scalacheck.jar.desired.sha1 new file mode 100644 index 0000000000..ed9c46c3db --- /dev/null +++ b/lib/scalacheck.jar.desired.sha1 @@ -0,0 +1 @@ +4c76385b1a9cb7cd619739776b940d98c4aadc6d ?scalacheck.jar diff --git a/test/files/cli/test1/Main.check.j9vm5 b/test/attic/files/cli/test1/Main.check.j9vm5 index de454ef478..de454ef478 100644 --- a/test/files/cli/test1/Main.check.j9vm5 +++ b/test/attic/files/cli/test1/Main.check.j9vm5 diff --git a/test/files/cli/test1/Main.check.java b/test/attic/files/cli/test1/Main.check.java index 64410de98f..64410de98f 100644 --- a/test/files/cli/test1/Main.check.java +++ b/test/attic/files/cli/test1/Main.check.java diff --git a/test/files/cli/test1/Main.check.java5 b/test/attic/files/cli/test1/Main.check.java5 index 64410de98f..64410de98f 100644 --- a/test/files/cli/test1/Main.check.java5 +++ b/test/attic/files/cli/test1/Main.check.java5 diff --git a/test/files/cli/test1/Main.check.java5_api b/test/attic/files/cli/test1/Main.check.java5_api index 8693a5d92f..8693a5d92f 100644 --- a/test/files/cli/test1/Main.check.java5_api +++ b/test/attic/files/cli/test1/Main.check.java5_api diff --git a/test/files/cli/test1/Main.check.java5_j9 b/test/attic/files/cli/test1/Main.check.java5_j9 index de454ef478..de454ef478 100644 --- a/test/files/cli/test1/Main.check.java5_j9 +++ b/test/attic/files/cli/test1/Main.check.java5_j9 diff --git a/test/files/cli/test1/Main.check.javac b/test/attic/files/cli/test1/Main.check.javac index ba25d9b6ca..ba25d9b6ca 100644 --- a/test/files/cli/test1/Main.check.javac +++ b/test/attic/files/cli/test1/Main.check.javac diff --git a/test/files/cli/test1/Main.check.javac5 b/test/attic/files/cli/test1/Main.check.javac5 index 0cb29d31ff..0cb29d31ff 100644 --- a/test/files/cli/test1/Main.check.javac5 +++ b/test/attic/files/cli/test1/Main.check.javac5 diff --git a/test/files/cli/test1/Main.check.javac6 b/test/attic/files/cli/test1/Main.check.javac6 index 8f37a05bcb..8f37a05bcb 100644 --- a/test/files/cli/test1/Main.check.javac6 +++ b/test/attic/files/cli/test1/Main.check.javac6 diff --git a/test/files/cli/test1/Main.check.jikes b/test/attic/files/cli/test1/Main.check.jikes index cd891689db..cd891689db 100644 --- a/test/files/cli/test1/Main.check.jikes +++ b/test/attic/files/cli/test1/Main.check.jikes diff --git a/test/files/cli/test1/Main.check.jikes5 b/test/attic/files/cli/test1/Main.check.jikes5 index cd891689db..cd891689db 100644 --- a/test/files/cli/test1/Main.check.jikes5 +++ b/test/attic/files/cli/test1/Main.check.jikes5 diff --git a/test/files/cli/test1/Main.check.scala b/test/attic/files/cli/test1/Main.check.scala index 43b200ae02..43b200ae02 100644 --- a/test/files/cli/test1/Main.check.scala +++ b/test/attic/files/cli/test1/Main.check.scala diff --git a/test/files/cli/test1/Main.check.scala_api b/test/attic/files/cli/test1/Main.check.scala_api index 6fac39d3f0..6fac39d3f0 100644 --- a/test/files/cli/test1/Main.check.scala_api +++ b/test/attic/files/cli/test1/Main.check.scala_api diff --git a/test/files/cli/test1/Main.check.scala_j9 b/test/attic/files/cli/test1/Main.check.scala_j9 index 65d5ddaac4..65d5ddaac4 100644 --- a/test/files/cli/test1/Main.check.scala_j9 +++ b/test/attic/files/cli/test1/Main.check.scala_j9 diff --git a/test/files/cli/test1/Main.check.scalac b/test/attic/files/cli/test1/Main.check.scalac index 8465810d0b..8465810d0b 100644 --- a/test/files/cli/test1/Main.check.scalac +++ b/test/attic/files/cli/test1/Main.check.scalac diff --git a/test/files/cli/test1/Main.check.scalaint b/test/attic/files/cli/test1/Main.check.scalaint index 88345d1874..88345d1874 100644 --- a/test/files/cli/test1/Main.check.scalaint +++ b/test/attic/files/cli/test1/Main.check.scalaint diff --git a/test/files/cli/test1/Main.java b/test/attic/files/cli/test1/Main.java index 8850b87517..8850b87517 100644 --- a/test/files/cli/test1/Main.java +++ b/test/attic/files/cli/test1/Main.java diff --git a/test/files/cli/test1/Main.scala b/test/attic/files/cli/test1/Main.scala index f7dd8a0a36..f7dd8a0a36 100644 --- a/test/files/cli/test1/Main.scala +++ b/test/attic/files/cli/test1/Main.scala diff --git a/test/files/cli/test2/Main.check.j9vm5 b/test/attic/files/cli/test2/Main.check.j9vm5 index 8f4fdf8aa1..8f4fdf8aa1 100644 --- a/test/files/cli/test2/Main.check.j9vm5 +++ b/test/attic/files/cli/test2/Main.check.j9vm5 diff --git a/test/files/cli/test2/Main.check.java b/test/attic/files/cli/test2/Main.check.java index aca383de3e..aca383de3e 100644 --- a/test/files/cli/test2/Main.check.java +++ b/test/attic/files/cli/test2/Main.check.java diff --git a/test/files/cli/test2/Main.check.java5 b/test/attic/files/cli/test2/Main.check.java5 index aca383de3e..aca383de3e 100644 --- a/test/files/cli/test2/Main.check.java5 +++ b/test/attic/files/cli/test2/Main.check.java5 diff --git a/test/files/cli/test2/Main.check.java5_api b/test/attic/files/cli/test2/Main.check.java5_api index 4ff775c3da..4ff775c3da 100644 --- a/test/files/cli/test2/Main.check.java5_api +++ b/test/attic/files/cli/test2/Main.check.java5_api diff --git a/test/files/cli/test2/Main.check.java5_j9 b/test/attic/files/cli/test2/Main.check.java5_j9 index 2dcb6e892a..2dcb6e892a 100644 --- a/test/files/cli/test2/Main.check.java5_j9 +++ b/test/attic/files/cli/test2/Main.check.java5_j9 diff --git a/test/files/cli/test2/Main.check.javac b/test/attic/files/cli/test2/Main.check.javac index c40c0a7a89..c40c0a7a89 100644 --- a/test/files/cli/test2/Main.check.javac +++ b/test/attic/files/cli/test2/Main.check.javac diff --git a/test/files/cli/test2/Main.check.javac5 b/test/attic/files/cli/test2/Main.check.javac5 index 0ac32b056e..0ac32b056e 100644 --- a/test/files/cli/test2/Main.check.javac5 +++ b/test/attic/files/cli/test2/Main.check.javac5 diff --git a/test/files/cli/test2/Main.check.javac6 b/test/attic/files/cli/test2/Main.check.javac6 index 350d3253bc..350d3253bc 100644 --- a/test/files/cli/test2/Main.check.javac6 +++ b/test/attic/files/cli/test2/Main.check.javac6 diff --git a/test/files/cli/test2/Main.check.jikes b/test/attic/files/cli/test2/Main.check.jikes index 97943e8347..97943e8347 100644 --- a/test/files/cli/test2/Main.check.jikes +++ b/test/attic/files/cli/test2/Main.check.jikes diff --git a/test/files/cli/test2/Main.check.jikes5 b/test/attic/files/cli/test2/Main.check.jikes5 index 97943e8347..97943e8347 100644 --- a/test/files/cli/test2/Main.check.jikes5 +++ b/test/attic/files/cli/test2/Main.check.jikes5 diff --git a/test/files/cli/test2/Main.check.scala b/test/attic/files/cli/test2/Main.check.scala index 7e5f17625b..7e5f17625b 100644 --- a/test/files/cli/test2/Main.check.scala +++ b/test/attic/files/cli/test2/Main.check.scala diff --git a/test/files/cli/test2/Main.check.scala_api b/test/attic/files/cli/test2/Main.check.scala_api index bcb0f0c7fb..bcb0f0c7fb 100644 --- a/test/files/cli/test2/Main.check.scala_api +++ b/test/attic/files/cli/test2/Main.check.scala_api diff --git a/test/files/cli/test2/Main.check.scala_j9 b/test/attic/files/cli/test2/Main.check.scala_j9 index 80cbb50fa9..80cbb50fa9 100644 --- a/test/files/cli/test2/Main.check.scala_j9 +++ b/test/attic/files/cli/test2/Main.check.scala_j9 diff --git a/test/files/cli/test2/Main.check.scalac b/test/attic/files/cli/test2/Main.check.scalac index 8465810d0b..8465810d0b 100644 --- a/test/files/cli/test2/Main.check.scalac +++ b/test/attic/files/cli/test2/Main.check.scalac diff --git a/test/files/cli/test2/Main.check.scalaint b/test/attic/files/cli/test2/Main.check.scalaint index 89b6766bb5..89b6766bb5 100644 --- a/test/files/cli/test2/Main.check.scalaint +++ b/test/attic/files/cli/test2/Main.check.scalaint diff --git a/test/files/cli/test2/Main.java b/test/attic/files/cli/test2/Main.java index f6797632bf..f6797632bf 100644 --- a/test/files/cli/test2/Main.java +++ b/test/attic/files/cli/test2/Main.java diff --git a/test/files/cli/test2/Main.scala b/test/attic/files/cli/test2/Main.scala index 1d43759fdf..1d43759fdf 100644 --- a/test/files/cli/test2/Main.scala +++ b/test/attic/files/cli/test2/Main.scala diff --git a/test/files/cli/test3/Main.check.j9vm5 b/test/attic/files/cli/test3/Main.check.j9vm5 index a094dc8daf..a094dc8daf 100644 --- a/test/files/cli/test3/Main.check.j9vm5 +++ b/test/attic/files/cli/test3/Main.check.j9vm5 diff --git a/test/files/cli/test3/Main.check.java b/test/attic/files/cli/test3/Main.check.java index de3eb7b136..de3eb7b136 100644 --- a/test/files/cli/test3/Main.check.java +++ b/test/attic/files/cli/test3/Main.check.java diff --git a/test/files/cli/test3/Main.check.java5 b/test/attic/files/cli/test3/Main.check.java5 index de3eb7b136..de3eb7b136 100644 --- a/test/files/cli/test3/Main.check.java5 +++ b/test/attic/files/cli/test3/Main.check.java5 diff --git a/test/files/cli/test3/Main.check.java5_api b/test/attic/files/cli/test3/Main.check.java5_api index f6112211f0..f6112211f0 100644 --- a/test/files/cli/test3/Main.check.java5_api +++ b/test/attic/files/cli/test3/Main.check.java5_api diff --git a/test/files/cli/test3/Main.check.java5_j9 b/test/attic/files/cli/test3/Main.check.java5_j9 index 9e228d7649..9e228d7649 100644 --- a/test/files/cli/test3/Main.check.java5_j9 +++ b/test/attic/files/cli/test3/Main.check.java5_j9 diff --git a/test/files/cli/test3/Main.check.javac b/test/attic/files/cli/test3/Main.check.javac index 8d235b647b..8d235b647b 100644 --- a/test/files/cli/test3/Main.check.javac +++ b/test/attic/files/cli/test3/Main.check.javac diff --git a/test/files/cli/test3/Main.check.javac5 b/test/attic/files/cli/test3/Main.check.javac5 index 3a48fa000e..3a48fa000e 100644 --- a/test/files/cli/test3/Main.check.javac5 +++ b/test/attic/files/cli/test3/Main.check.javac5 diff --git a/test/files/cli/test3/Main.check.javac6 b/test/attic/files/cli/test3/Main.check.javac6 index 677b950aed..677b950aed 100644 --- a/test/files/cli/test3/Main.check.javac6 +++ b/test/attic/files/cli/test3/Main.check.javac6 diff --git a/test/files/cli/test3/Main.check.jikes b/test/attic/files/cli/test3/Main.check.jikes index 604333e81a..604333e81a 100644 --- a/test/files/cli/test3/Main.check.jikes +++ b/test/attic/files/cli/test3/Main.check.jikes diff --git a/test/files/cli/test3/Main.check.jikes5 b/test/attic/files/cli/test3/Main.check.jikes5 index 604333e81a..604333e81a 100644 --- a/test/files/cli/test3/Main.check.jikes5 +++ b/test/attic/files/cli/test3/Main.check.jikes5 diff --git a/test/files/cli/test3/Main.check.scala b/test/attic/files/cli/test3/Main.check.scala index f78729b9a2..f78729b9a2 100644 --- a/test/files/cli/test3/Main.check.scala +++ b/test/attic/files/cli/test3/Main.check.scala diff --git a/test/files/cli/test3/Main.check.scala_api b/test/attic/files/cli/test3/Main.check.scala_api index 4552819b5b..4552819b5b 100644 --- a/test/files/cli/test3/Main.check.scala_api +++ b/test/attic/files/cli/test3/Main.check.scala_api diff --git a/test/files/cli/test3/Main.check.scala_j9 b/test/attic/files/cli/test3/Main.check.scala_j9 index 3804c17636..3804c17636 100644 --- a/test/files/cli/test3/Main.check.scala_j9 +++ b/test/attic/files/cli/test3/Main.check.scala_j9 diff --git a/test/files/cli/test3/Main.check.scalac b/test/attic/files/cli/test3/Main.check.scalac index 8465810d0b..8465810d0b 100644 --- a/test/files/cli/test3/Main.check.scalac +++ b/test/attic/files/cli/test3/Main.check.scalac diff --git a/test/files/cli/test3/Main.check.scalaint b/test/attic/files/cli/test3/Main.check.scalaint index cffa02c5b6..cffa02c5b6 100644 --- a/test/files/cli/test3/Main.check.scalaint +++ b/test/attic/files/cli/test3/Main.check.scalaint diff --git a/test/files/cli/test3/Main.java b/test/attic/files/cli/test3/Main.java index 208863d012..208863d012 100644 --- a/test/files/cli/test3/Main.java +++ b/test/attic/files/cli/test3/Main.java diff --git a/test/files/cli/test3/Main.scala b/test/attic/files/cli/test3/Main.scala index 63fc11b771..63fc11b771 100644 --- a/test/files/cli/test3/Main.scala +++ b/test/attic/files/cli/test3/Main.scala diff --git a/test/files/continuations-neg/function0.check b/test/continuations/neg/function0.check index 0a66763a0f..0a66763a0f 100644 --- a/test/files/continuations-neg/function0.check +++ b/test/continuations/neg/function0.check diff --git a/test/files/continuations-neg/function0.scala b/test/continuations/neg/function0.scala index 4112ee3835..4112ee3835 100644 --- a/test/files/continuations-neg/function0.scala +++ b/test/continuations/neg/function0.scala diff --git a/test/files/continuations-neg/function2.check b/test/continuations/neg/function2.check index 4833057652..4833057652 100644 --- a/test/files/continuations-neg/function2.check +++ b/test/continuations/neg/function2.check diff --git a/test/files/continuations-neg/function2.scala b/test/continuations/neg/function2.scala index ae0fda509d..ae0fda509d 100644 --- a/test/files/continuations-neg/function2.scala +++ b/test/continuations/neg/function2.scala diff --git a/test/files/continuations-neg/function3.check b/test/continuations/neg/function3.check index 4705ad9ed9..4705ad9ed9 100644 --- a/test/files/continuations-neg/function3.check +++ b/test/continuations/neg/function3.check diff --git a/test/files/continuations-neg/function3.scala b/test/continuations/neg/function3.scala index 0c3f1667e5..0c3f1667e5 100644 --- a/test/files/continuations-neg/function3.scala +++ b/test/continuations/neg/function3.scala diff --git a/test/files/continuations-neg/infer0.check b/test/continuations/neg/infer0.check index 1dd072ef09..1dd072ef09 100644 --- a/test/files/continuations-neg/infer0.check +++ b/test/continuations/neg/infer0.check diff --git a/test/files/continuations-neg/infer0.scala b/test/continuations/neg/infer0.scala index 894d5228b1..894d5228b1 100644 --- a/test/files/continuations-neg/infer0.scala +++ b/test/continuations/neg/infer0.scala diff --git a/test/files/continuations-neg/infer2.check b/test/continuations/neg/infer2.check index 59eb670bc3..59eb670bc3 100644 --- a/test/files/continuations-neg/infer2.check +++ b/test/continuations/neg/infer2.check diff --git a/test/files/continuations-neg/infer2.scala b/test/continuations/neg/infer2.scala index a890ac1fc4..a890ac1fc4 100644 --- a/test/files/continuations-neg/infer2.scala +++ b/test/continuations/neg/infer2.scala diff --git a/test/files/continuations-neg/lazy.check b/test/continuations/neg/lazy.check index bfa44c59a4..bfa44c59a4 100644 --- a/test/files/continuations-neg/lazy.check +++ b/test/continuations/neg/lazy.check diff --git a/test/files/continuations-neg/lazy.scala b/test/continuations/neg/lazy.scala index dffc57ffa0..dffc57ffa0 100644 --- a/test/files/continuations-neg/lazy.scala +++ b/test/continuations/neg/lazy.scala diff --git a/test/files/continuations-neg/t1929.check b/test/continuations/neg/t1929.check index f42c3a1e15..f42c3a1e15 100644 --- a/test/files/continuations-neg/t1929.check +++ b/test/continuations/neg/t1929.check diff --git a/test/files/continuations-neg/t1929.scala b/test/continuations/neg/t1929.scala index 02eda9170d..02eda9170d 100644 --- a/test/files/continuations-neg/t1929.scala +++ b/test/continuations/neg/t1929.scala diff --git a/test/files/continuations-neg/t2285.check b/test/continuations/neg/t2285.check index d5dff6a4f2..d5dff6a4f2 100644 --- a/test/files/continuations-neg/t2285.check +++ b/test/continuations/neg/t2285.check diff --git a/test/files/continuations-neg/t2285.scala b/test/continuations/neg/t2285.scala index f3c7f4c89c..f3c7f4c89c 100644 --- a/test/files/continuations-neg/t2285.scala +++ b/test/continuations/neg/t2285.scala diff --git a/test/files/continuations-neg/t2949.check b/test/continuations/neg/t2949.check index dd9768807c..dd9768807c 100644 --- a/test/files/continuations-neg/t2949.check +++ b/test/continuations/neg/t2949.check diff --git a/test/files/continuations-neg/t2949.scala b/test/continuations/neg/t2949.scala index ce27c7c0e8..ce27c7c0e8 100644 --- a/test/files/continuations-neg/t2949.scala +++ b/test/continuations/neg/t2949.scala diff --git a/test/files/continuations-neg/trycatch2.check b/test/continuations/neg/trycatch2.check index 5ff2838bad..5ff2838bad 100644 --- a/test/files/continuations-neg/trycatch2.check +++ b/test/continuations/neg/trycatch2.check diff --git a/test/files/continuations-neg/trycatch2.scala b/test/continuations/neg/trycatch2.scala index 761cee52ac..761cee52ac 100644 --- a/test/files/continuations-neg/trycatch2.scala +++ b/test/continuations/neg/trycatch2.scala diff --git a/test/files/continuations-run/basics.check b/test/continuations/run/basics.check index 54c059fdcb..54c059fdcb 100755 --- a/test/files/continuations-run/basics.check +++ b/test/continuations/run/basics.check diff --git a/test/files/continuations-run/basics.scala b/test/continuations/run/basics.scala index 9df209b11c..9df209b11c 100755 --- a/test/files/continuations-run/basics.scala +++ b/test/continuations/run/basics.scala diff --git a/test/files/continuations-run/function1.check b/test/continuations/run/function1.check index 7f8f011eb7..7f8f011eb7 100644 --- a/test/files/continuations-run/function1.check +++ b/test/continuations/run/function1.check diff --git a/test/files/continuations-run/function1.scala b/test/continuations/run/function1.scala index 3b39722e3a..3b39722e3a 100644 --- a/test/files/continuations-run/function1.scala +++ b/test/continuations/run/function1.scala diff --git a/test/files/continuations-run/function4.check b/test/continuations/run/function4.check index c7930257df..c7930257df 100644 --- a/test/files/continuations-run/function4.check +++ b/test/continuations/run/function4.check diff --git a/test/files/continuations-run/function4.scala b/test/continuations/run/function4.scala index b73eedb02c..b73eedb02c 100644 --- a/test/files/continuations-run/function4.scala +++ b/test/continuations/run/function4.scala diff --git a/test/files/continuations-run/function5.check b/test/continuations/run/function5.check index c7930257df..c7930257df 100644 --- a/test/files/continuations-run/function5.check +++ b/test/continuations/run/function5.check diff --git a/test/files/continuations-run/function5.scala b/test/continuations/run/function5.scala index a689ccf243..a689ccf243 100644 --- a/test/files/continuations-run/function5.scala +++ b/test/continuations/run/function5.scala diff --git a/test/files/continuations-run/function6.check b/test/continuations/run/function6.check index c7930257df..c7930257df 100644 --- a/test/files/continuations-run/function6.check +++ b/test/continuations/run/function6.check diff --git a/test/files/continuations-run/function6.scala b/test/continuations/run/function6.scala index 1a2792370a..1a2792370a 100644 --- a/test/files/continuations-run/function6.scala +++ b/test/continuations/run/function6.scala diff --git a/test/files/continuations-run/ifelse0.check b/test/continuations/run/ifelse0.check index f8bc79860d..f8bc79860d 100644 --- a/test/files/continuations-run/ifelse0.check +++ b/test/continuations/run/ifelse0.check diff --git a/test/files/continuations-run/ifelse0.scala b/test/continuations/run/ifelse0.scala index e34b86ee84..e34b86ee84 100644 --- a/test/files/continuations-run/ifelse0.scala +++ b/test/continuations/run/ifelse0.scala diff --git a/test/files/continuations-run/ifelse1.check b/test/continuations/run/ifelse1.check index 86a3fbc0c1..86a3fbc0c1 100644 --- a/test/files/continuations-run/ifelse1.check +++ b/test/continuations/run/ifelse1.check diff --git a/test/files/continuations-run/ifelse1.scala b/test/continuations/run/ifelse1.scala index 2ccc1ed730..2ccc1ed730 100644 --- a/test/files/continuations-run/ifelse1.scala +++ b/test/continuations/run/ifelse1.scala diff --git a/test/files/continuations-run/ifelse2.check b/test/continuations/run/ifelse2.check index f97a95b08d..f97a95b08d 100644 --- a/test/files/continuations-run/ifelse2.check +++ b/test/continuations/run/ifelse2.check diff --git a/test/files/continuations-run/ifelse2.scala b/test/continuations/run/ifelse2.scala index 536e350190..536e350190 100644 --- a/test/files/continuations-run/ifelse2.scala +++ b/test/continuations/run/ifelse2.scala diff --git a/test/files/continuations-run/ifelse3.check b/test/continuations/run/ifelse3.check index 95b562c8e6..95b562c8e6 100644 --- a/test/files/continuations-run/ifelse3.check +++ b/test/continuations/run/ifelse3.check diff --git a/test/files/continuations-run/ifelse3.scala b/test/continuations/run/ifelse3.scala index 5dbd079d1c..5dbd079d1c 100644 --- a/test/files/continuations-run/ifelse3.scala +++ b/test/continuations/run/ifelse3.scala diff --git a/test/files/continuations-run/infer1.scala b/test/continuations/run/infer1.scala index a6c6c07215..a6c6c07215 100644 --- a/test/files/continuations-run/infer1.scala +++ b/test/continuations/run/infer1.scala diff --git a/test/files/continuations-run/match0.check b/test/continuations/run/match0.check index f8bc79860d..f8bc79860d 100644 --- a/test/files/continuations-run/match0.check +++ b/test/continuations/run/match0.check diff --git a/test/files/continuations-run/match0.scala b/test/continuations/run/match0.scala index bd36238d7f..bd36238d7f 100644 --- a/test/files/continuations-run/match0.scala +++ b/test/continuations/run/match0.scala diff --git a/test/files/continuations-run/match1.check b/test/continuations/run/match1.check index 73053d3f4f..73053d3f4f 100644 --- a/test/files/continuations-run/match1.check +++ b/test/continuations/run/match1.check diff --git a/test/files/continuations-run/match1.scala b/test/continuations/run/match1.scala index ea4e219666..ea4e219666 100644 --- a/test/files/continuations-run/match1.scala +++ b/test/continuations/run/match1.scala diff --git a/test/files/continuations-run/match2.check b/test/continuations/run/match2.check index cbf91349cc..cbf91349cc 100644 --- a/test/files/continuations-run/match2.check +++ b/test/continuations/run/match2.check diff --git a/test/files/continuations-run/match2.scala b/test/continuations/run/match2.scala index 8d4f04870f..8d4f04870f 100644 --- a/test/files/continuations-run/match2.scala +++ b/test/continuations/run/match2.scala diff --git a/test/files/continuations-run/t1807.check b/test/continuations/run/t1807.check index 56a6051ca2..56a6051ca2 100644 --- a/test/files/continuations-run/t1807.check +++ b/test/continuations/run/t1807.check diff --git a/test/files/continuations-run/t1807.scala b/test/continuations/run/t1807.scala index 278b3a9936..278b3a9936 100644 --- a/test/files/continuations-run/t1807.scala +++ b/test/continuations/run/t1807.scala diff --git a/test/files/continuations-run/t1808.scala b/test/continuations/run/t1808.scala index 125c7c1cdf..125c7c1cdf 100644 --- a/test/files/continuations-run/t1808.scala +++ b/test/continuations/run/t1808.scala diff --git a/test/files/continuations-run/t1820.scala b/test/continuations/run/t1820.scala index 893ddab6d1..893ddab6d1 100644 --- a/test/files/continuations-run/t1820.scala +++ b/test/continuations/run/t1820.scala diff --git a/test/files/continuations-run/t1821.check b/test/continuations/run/t1821.check index f7b76115db..f7b76115db 100644 --- a/test/files/continuations-run/t1821.check +++ b/test/continuations/run/t1821.check diff --git a/test/files/continuations-run/t1821.scala b/test/continuations/run/t1821.scala index 0d5fb553be..0d5fb553be 100644 --- a/test/files/continuations-run/t1821.scala +++ b/test/continuations/run/t1821.scala diff --git a/test/files/continuations-run/t2864.check b/test/continuations/run/t2864.check index d411bb7c1a..d411bb7c1a 100644 --- a/test/files/continuations-run/t2864.check +++ b/test/continuations/run/t2864.check diff --git a/test/files/continuations-run/t2864.scala b/test/continuations/run/t2864.scala index 7a2579e45c..7a2579e45c 100644 --- a/test/files/continuations-run/t2864.scala +++ b/test/continuations/run/t2864.scala diff --git a/test/files/continuations-run/t2934.check b/test/continuations/run/t2934.check index a92586538e..a92586538e 100644 --- a/test/files/continuations-run/t2934.check +++ b/test/continuations/run/t2934.check diff --git a/test/files/continuations-run/t2934.scala b/test/continuations/run/t2934.scala index a1b8ca9e04..a1b8ca9e04 100644 --- a/test/files/continuations-run/t2934.scala +++ b/test/continuations/run/t2934.scala diff --git a/test/files/continuations-run/t3199.check b/test/continuations/run/t3199.check index a065247b8c..a065247b8c 100644 --- a/test/files/continuations-run/t3199.check +++ b/test/continuations/run/t3199.check diff --git a/test/files/continuations-run/t3199.scala b/test/continuations/run/t3199.scala index 3fd2f1959a..3fd2f1959a 100644 --- a/test/files/continuations-run/t3199.scala +++ b/test/continuations/run/t3199.scala diff --git a/test/files/continuations-run/t3199b.check b/test/continuations/run/t3199b.check index b5d8bb58d9..b5d8bb58d9 100644 --- a/test/files/continuations-run/t3199b.check +++ b/test/continuations/run/t3199b.check diff --git a/test/files/continuations-run/t3199b.scala b/test/continuations/run/t3199b.scala index 950c584153..950c584153 100644 --- a/test/files/continuations-run/t3199b.scala +++ b/test/continuations/run/t3199b.scala diff --git a/test/files/continuations-run/t3223.check b/test/continuations/run/t3223.check index ec635144f6..ec635144f6 100644 --- a/test/files/continuations-run/t3223.check +++ b/test/continuations/run/t3223.check diff --git a/test/files/continuations-run/t3223.scala b/test/continuations/run/t3223.scala index 4e510178e6..4e510178e6 100644 --- a/test/files/continuations-run/t3223.scala +++ b/test/continuations/run/t3223.scala diff --git a/test/files/continuations-run/t3225.check b/test/continuations/run/t3225.check index df1a8a9ce4..df1a8a9ce4 100644 --- a/test/files/continuations-run/t3225.check +++ b/test/continuations/run/t3225.check diff --git a/test/files/continuations-run/t3225.scala b/test/continuations/run/t3225.scala index ecfde279cf..ecfde279cf 100644 --- a/test/files/continuations-run/t3225.scala +++ b/test/continuations/run/t3225.scala diff --git a/test/files/continuations-run/trycatch0.check b/test/continuations/run/trycatch0.check index 36806909d0..36806909d0 100644 --- a/test/files/continuations-run/trycatch0.check +++ b/test/continuations/run/trycatch0.check diff --git a/test/files/continuations-run/trycatch0.scala b/test/continuations/run/trycatch0.scala index 74a078b5ef..74a078b5ef 100644 --- a/test/files/continuations-run/trycatch0.scala +++ b/test/continuations/run/trycatch0.scala diff --git a/test/files/continuations-run/trycatch1.check b/test/continuations/run/trycatch1.check index a028d2b1e1..a028d2b1e1 100644 --- a/test/files/continuations-run/trycatch1.check +++ b/test/continuations/run/trycatch1.check diff --git a/test/files/continuations-run/trycatch1.scala b/test/continuations/run/trycatch1.scala index ade13794e3..ade13794e3 100644 --- a/test/files/continuations-run/trycatch1.scala +++ b/test/continuations/run/trycatch1.scala diff --git a/test/files/continuations-run/while0.check b/test/continuations/run/while0.check index d58c55a31d..d58c55a31d 100644 --- a/test/files/continuations-run/while0.check +++ b/test/continuations/run/while0.check diff --git a/test/files/continuations-run/while0.scala b/test/continuations/run/while0.scala index 9735f9d2c3..9735f9d2c3 100644 --- a/test/files/continuations-run/while0.scala +++ b/test/continuations/run/while0.scala diff --git a/test/files/continuations-run/while1.check b/test/continuations/run/while1.check index 3d5f0b9a46..3d5f0b9a46 100644 --- a/test/files/continuations-run/while1.check +++ b/test/continuations/run/while1.check diff --git a/test/files/continuations-run/while1.scala b/test/continuations/run/while1.scala index fb5dc0079a..fb5dc0079a 100644 --- a/test/files/continuations-run/while1.scala +++ b/test/continuations/run/while1.scala diff --git a/test/files/continuations-run/while2.check b/test/continuations/run/while2.check index 9fe515181b..9fe515181b 100644 --- a/test/files/continuations-run/while2.check +++ b/test/continuations/run/while2.check diff --git a/test/files/continuations-run/while2.scala b/test/continuations/run/while2.scala index f36288929e..f36288929e 100644 --- a/test/files/continuations-run/while2.scala +++ b/test/continuations/run/while2.scala diff --git a/test/files/script/loadAndExecute/loadAndExecute.check b/test/disabled-windows/script/loadAndExecute.check index ccd8cd6e37..ccd8cd6e37 100644 --- a/test/files/script/loadAndExecute/loadAndExecute.check +++ b/test/disabled-windows/script/loadAndExecute.check diff --git a/test/files/script/loadAndExecute/lAndE1.scala b/test/disabled-windows/script/loadAndExecute/lAndE1.scala index b20d1a9428..b20d1a9428 100755 --- a/test/files/script/loadAndExecute/lAndE1.scala +++ b/test/disabled-windows/script/loadAndExecute/lAndE1.scala diff --git a/test/files/script/loadAndExecute/lAndE2.scala b/test/disabled-windows/script/loadAndExecute/lAndE2.scala index ea15a04d86..ea15a04d86 100755 --- a/test/files/script/loadAndExecute/lAndE2.scala +++ b/test/disabled-windows/script/loadAndExecute/lAndE2.scala diff --git a/test/files/script/loadAndExecute/loadAndExecute.scala b/test/disabled-windows/script/loadAndExecute/loadAndExecute.scala index 2a9718382b..2a9718382b 100755 --- a/test/files/script/loadAndExecute/loadAndExecute.scala +++ b/test/disabled-windows/script/loadAndExecute/loadAndExecute.scala diff --git a/test/files/script/utf8.bat b/test/disabled-windows/script/utf8.bat index 8bc5c886f7..8bc5c886f7 100755 --- a/test/files/script/utf8.bat +++ b/test/disabled-windows/script/utf8.bat diff --git a/test/files/script/utf8.check b/test/disabled-windows/script/utf8.check index 29dc0518ff..29dc0518ff 100644 --- a/test/files/script/utf8.check +++ b/test/disabled-windows/script/utf8.check diff --git a/test/files/script/utf8.scala b/test/disabled-windows/script/utf8.scala index 5366562cee..f294498cd2 100755 --- a/test/files/script/utf8.scala +++ b/test/disabled-windows/script/utf8.scala @@ -1,6 +1,6 @@ #!/bin/sh -# fact - A simple Scala script that prints out the factorial of -# the argument specified on the command line. +# +# Checks if UTF-8 output makes it through unmangled. cygwin=false; case "`uname`" in @@ -18,8 +18,7 @@ then SOURCE=`cygpath --$format "$SOURCE"`; fi -export LC_CTYPE=en_US.UTF-8 -exec scala -nocompdaemon "$SOURCE" "$@" +exec scala -Dfile.encoding="UTF-8" -nocompdaemon "$SOURCE" "$@" !# /*Comment Комментарий*/ diff --git a/test/files/bench/equality/eqeq.log b/test/files/bench/equality/eqeq.eqlog index d1e27aceed..d1e27aceed 100755..100644 --- a/test/files/bench/equality/eqeq.log +++ b/test/files/bench/equality/eqeq.eqlog diff --git a/test/files/buildmanager/t2653/t2653.changes/A2.scala b/test/files/buildmanager/t2653/t2653.changes/A2.scala index ffc1b97ebb..51d13cce6e 100644 --- a/test/files/buildmanager/t2653/t2653.changes/A2.scala +++ b/test/files/buildmanager/t2653/t2653.changes/A2.scala @@ -1,3 +1,2 @@ class A[T] - diff --git a/test/files/files.iml b/test/files/files.iml deleted file mode 100644 index ac78e33f39..0000000000 --- a/test/files/files.iml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Scala" name="Scala"> - <configuration /> - </facet> - </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$" /> - <orderEntry type="library" name="lib1" level="project" /> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib" level="project" /> - </component> -</module> - diff --git a/test/files/jvm/deprecation.cmds b/test/files/jvm/deprecation.cmds new file mode 100644 index 0000000000..4c0f73c58b --- /dev/null +++ b/test/files/jvm/deprecation.cmds @@ -0,0 +1,3 @@ +javac Defs.java +scalac Test_1.scala +javac Use_2.java diff --git a/test/files/lib/genericNest.jar.desired.sha1 b/test/files/jvm/genericNest/genericNest.jar.desired.sha1 index e9321262f2..e9321262f2 100644 --- a/test/files/lib/genericNest.jar.desired.sha1 +++ b/test/files/jvm/genericNest/genericNest.jar.desired.sha1 diff --git a/test/files/jvm/genericNest.scala b/test/files/jvm/genericNest/genericNest.scala index c1b0210117..c1b0210117 100644 --- a/test/files/jvm/genericNest.scala +++ b/test/files/jvm/genericNest/genericNest.scala diff --git a/test/files/jvm/inner.scala b/test/files/jvm/inner.scala index d6b055e998..d0d2226de6 100644 --- a/test/files/jvm/inner.scala +++ b/test/files/jvm/inner.scala @@ -53,7 +53,7 @@ class A { } object Scalatest { - private val outputdir = System.getProperty("partest.output", "inner-jvm.obj") + private val outputdir = System.getProperty("partest.output", "inner.obj") private val scalalib = System.getProperty("partest.lib", "") private val classpath = outputdir + File.pathSeparator + scalalib private val javabin = { diff --git a/test/files/lib/annotations.jar.desired.sha1 b/test/files/jvm/lib/annotations.jar.desired.sha1 index 2b4292d796..2b4292d796 100644 --- a/test/files/lib/annotations.jar.desired.sha1 +++ b/test/files/jvm/lib/annotations.jar.desired.sha1 diff --git a/test/files/lib/nest.jar.desired.sha1 b/test/files/jvm/lib/nest.jar.desired.sha1 index 674ca79a5b..674ca79a5b 100644 --- a/test/files/lib/nest.jar.desired.sha1 +++ b/test/files/jvm/lib/nest.jar.desired.sha1 diff --git a/test/files/lib/methvsfield.jar.desired.sha1 b/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 index 8c01532b88..8c01532b88 100644 --- a/test/files/lib/methvsfield.jar.desired.sha1 +++ b/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 diff --git a/test/files/jvm/methvsfield.java b/test/files/jvm/methvsfield/methvsfield.java index dadc98669a..dadc98669a 100644 --- a/test/files/jvm/methvsfield.java +++ b/test/files/jvm/methvsfield/methvsfield.java diff --git a/test/files/jvm/methvsfield.scala b/test/files/jvm/methvsfield/methvsfield.scala index e9795ec6a8..e9795ec6a8 100644 --- a/test/files/jvm/methvsfield.scala +++ b/test/files/jvm/methvsfield/methvsfield.scala diff --git a/test/files/jvm/nest.java b/test/files/jvm/nest/nest.java index 3f6f0bebbd..3f6f0bebbd 100644 --- a/test/files/jvm/nest.java +++ b/test/files/jvm/nest/nest.java diff --git a/test/files/jvm/nest.scala b/test/files/jvm/nest/nest.scala index 3ab62484fa..3ab62484fa 100644 --- a/test/files/jvm/nest.scala +++ b/test/files/jvm/nest/nest.scala diff --git a/test/files/lib/enums.jar.desired.sha1 b/test/files/jvm/outerEnum/enums.jar.desired.sha1 index 46cd8e92cf..46cd8e92cf 100644 --- a/test/files/lib/enums.jar.desired.sha1 +++ b/test/files/jvm/outerEnum/enums.jar.desired.sha1 diff --git a/test/files/jvm/outerEnum.scala b/test/files/jvm/outerEnum/outerEnum.scala index 18794b7dbe..18794b7dbe 100644 --- a/test/files/jvm/outerEnum.scala +++ b/test/files/jvm/outerEnum/outerEnum.scala diff --git a/test/files/jvm/t1652.check b/test/files/jvm/t1652.check deleted file mode 100644 index dfa480ce6e..0000000000 --- a/test/files/jvm/t1652.check +++ /dev/null @@ -1,2 +0,0 @@ -OK1 -OK2 diff --git a/test/files/jvm/t2470.cmds b/test/files/jvm/t2470.cmds new file mode 100644 index 0000000000..b4ef0f4aeb --- /dev/null +++ b/test/files/jvm/t2470.cmds @@ -0,0 +1,3 @@ +javac Action.java Task.java +scalac Test_1.scala +scalac Read_Classfile_2.scala diff --git a/test/files/jvm/t3003.cmds b/test/files/jvm/t3003.cmds new file mode 100644 index 0000000000..c00396627c --- /dev/null +++ b/test/files/jvm/t3003.cmds @@ -0,0 +1,2 @@ +javac Annot.java +scalac Test_1.scala diff --git a/test/files/jvm/unittest_io.scala b/test/files/jvm/unittest_io.scala index 0cf1165ec8..80d33d8433 100644 --- a/test/files/jvm/unittest_io.scala +++ b/test/files/jvm/unittest_io.scala @@ -16,7 +16,7 @@ it is split on several lines. isn't it? """) def runTest() = assertEquals("wrong number of lines",src.getLines("\n").toList.length,5) // five new lines in there - //for(val line <- src.getLines) { + //for (line <- src.getLines) { // Console.print(line) //} } diff --git a/test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1 b/test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1 deleted file mode 100644 index 7e2fa52b0c..0000000000 --- a/test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -4c76385b1a9cb7cd619739776b940d98c4aadc6d ?scalacheck-1.7-SNAPSHOT.jar diff --git a/test/files/neg/bug1279a.check b/test/files/neg/bug1279a.check deleted file mode 100644 index edfd1fe871..0000000000 --- a/test/files/neg/bug1279a.check +++ /dev/null @@ -1,6 +0,0 @@ -bug1279a.scala:34: error: type mismatch; - found : first.selfType - required: M{type T <: this.T} - def all4Impl[U](first: M {type T <: U}): Stream[M {type T <: U}] = Stream.cons(first, all4Impl(first.next)) - ^ -one error found diff --git a/test/files/neg/bug414.check b/test/files/neg/bug414.check index c0f039ad26..ec23e26337 100644 --- a/test/files/neg/bug414.check +++ b/test/files/neg/bug414.check @@ -1,7 +1,3 @@ -bug414.scala:1: warning: case classes without a parameter list have been deprecated; -use either case objects or case classes with `()' as parameter list. -case class Empty[a] extends IntMap[a]; - ^ bug414.scala:5: error: pattern type is incompatible with expected type; found : object Empty required: IntMap[a] @@ -12,5 +8,4 @@ bug414.scala:7: error: type mismatch; required: a case _ => ^ -one warning found two errors found diff --git a/test/files/neg/bug961.check b/test/files/neg/bug961.check index 8b407d1d0c..439ed98675 100644 --- a/test/files/neg/bug961.check +++ b/test/files/neg/bug961.check @@ -1,9 +1,4 @@ -bug961.scala:4: warning: case classes without a parameter list have been deprecated; -use either case objects or case classes with `()' as parameter list. - private case class B_inner extends A - ^ bug961.scala:11: error: Temp.this.B of type object Temp.B does not take parameters B() match { ^ -one warning found one error found diff --git a/test/files/neg/bug961.scala b/test/files/neg/bug961.scala index 15309b96b4..088bddd7ee 100644 --- a/test/files/neg/bug961.scala +++ b/test/files/neg/bug961.scala @@ -1,7 +1,7 @@ -object Temp{ +object Temp { abstract class A - object B{ - private case class B_inner extends A + object B { + private case class B_inner() extends A def apply: A = B_inner() def unapply(a: A) = a match { case B_inner() => true diff --git a/test/files/neg/migration28.check b/test/files/neg/migration28.check index 4c8c58e0fd..9e042a0f0b 100644 --- a/test/files/neg/migration28.check +++ b/test/files/neg/migration28.check @@ -1,4 +1,5 @@ -migration28.scala:5: error: method ++= in class Stack is deprecated: use pushAll +migration28.scala:5: error: method ++= in class Stack has changed semantics: +Stack ++= now pushes arguments on the stack from left to right. s ++= List(1,2,3) ^ migration28.scala:7: error: method foreach in class Stack has changed semantics: diff --git a/test/files/neg/multi-array.flags b/test/files/neg/multi-array.flags new file mode 100644 index 0000000000..c36e713ab8 --- /dev/null +++ b/test/files/neg/multi-array.flags @@ -0,0 +1 @@ +-deprecation
\ No newline at end of file diff --git a/test/files/neg/t3115.flags b/test/files/neg/t3115.flags index a28140df4e..bf8f88334b 100644 --- a/test/files/neg/t3115.flags +++ b/test/files/neg/t3115.flags @@ -1 +1 @@ --Yfatal-warnings
\ No newline at end of file +-deprecation -Yfatal-warnings
\ No newline at end of file diff --git a/test/files/pos/bug715.cmds b/test/files/pos/bug715.cmds new file mode 100644 index 0000000000..2836967fca --- /dev/null +++ b/test/files/pos/bug715.cmds @@ -0,0 +1,2 @@ +scalac meredith_1.scala +scalac runner_2.scala diff --git a/test/files/pos/spec-partially.flags b/test/files/pos/spec-partially.flags index a5f3e74f73..973517e1c9 100644 --- a/test/files/pos/spec-partially.flags +++ b/test/files/pos/spec-partially.flags @@ -1 +1 @@ --Yspecialized +-Yspecialize diff --git a/test/files/pos/super.cmds b/test/files/pos/super.cmds new file mode 100644 index 0000000000..8f3f8a4172 --- /dev/null +++ b/test/files/pos/super.cmds @@ -0,0 +1,2 @@ +javac Super_1.java +scalac Super_2.scala diff --git a/test/files/pos/switchUnbox.flags b/test/files/pos/switchUnbox.flags index ec1ad20e3a..cdf5f84ede 100644 --- a/test/files/pos/switchUnbox.flags +++ b/test/files/pos/switchUnbox.flags @@ -1 +1 @@ --Xsqueeze:on +-Ysqueeze:on diff --git a/test/files/pos/t0971.java b/test/files/pos/t0971.java deleted file mode 100644 index 160dc2c5af..0000000000 --- a/test/files/pos/t0971.java +++ /dev/null @@ -1,4 +0,0 @@ -class A { - int y = 1, z; - static Object x = new java.util.HashMap<Object , Object > () ; -} diff --git a/test/files/pos/t1029.cmds b/test/files/pos/t1029.cmds new file mode 100644 index 0000000000..06b863dc03 --- /dev/null +++ b/test/files/pos/t1029.cmds @@ -0,0 +1,2 @@ +scalac Test_1.scala +scalac Test_2.scala diff --git a/test/files/pos/t1380.flags b/test/files/pos/t1380.flags deleted file mode 100644 index f0b0ef7f51..0000000000 --- a/test/files/pos/t1380.flags +++ /dev/null @@ -1 +0,0 @@ --cp pending/pos/t1380/gnujaxp.jar diff --git a/test/files/pos/t1751.cmds b/test/files/pos/t1751.cmds new file mode 100644 index 0000000000..d4a4898ffd --- /dev/null +++ b/test/files/pos/t1751.cmds @@ -0,0 +1,3 @@ +javac SuiteClasses.java +scalac A2_1.scala +scalac A1_2.scala diff --git a/test/files/pos/t1782.cmds b/test/files/pos/t1782.cmds new file mode 100644 index 0000000000..61f3d3788e --- /dev/null +++ b/test/files/pos/t1782.cmds @@ -0,0 +1,2 @@ +javac Ann.java Days.java ImplementedBy.java +scalac Test_1.scala diff --git a/test/files/pos/t1942.cmds b/test/files/pos/t1942.cmds new file mode 100644 index 0000000000..c14311042a --- /dev/null +++ b/test/files/pos/t1942.cmds @@ -0,0 +1,2 @@ +scalac A_1.scala +scalac Test_2.scala diff --git a/test/files/pos/t2464.cmds b/test/files/pos/t2464.cmds new file mode 100644 index 0000000000..ca733ef23d --- /dev/null +++ b/test/files/pos/t2464.cmds @@ -0,0 +1,3 @@ +javac JavaOne.java +scalac ScalaOne_1.scala +scalac t2464_2.scala diff --git a/test/files/pos/t2726.cmds b/test/files/pos/t2726.cmds new file mode 100644 index 0000000000..5fcb18bfbb --- /dev/null +++ b/test/files/pos/t2726.cmds @@ -0,0 +1,2 @@ +scalac SQLBuilder_1.scala +scalac test_2.scala diff --git a/test/files/pos/t2868.cmds b/test/files/pos/t2868.cmds new file mode 100644 index 0000000000..ed8124a9e0 --- /dev/null +++ b/test/files/pos/t2868.cmds @@ -0,0 +1,3 @@ +javac Jann.java Nest.java +scalac pick_1.scala +scalac test_2.scala diff --git a/test/files/pos/t294.cmds b/test/files/pos/t294.cmds new file mode 100644 index 0000000000..62c9a5a068 --- /dev/null +++ b/test/files/pos/t294.cmds @@ -0,0 +1,3 @@ +javac Ann.java Ann2.java +scalac Test_1.scala +scalac Test_2.scala diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check index ee9520d1ea..353101c38b 100644 --- a/test/files/res/bug687.check +++ b/test/files/res/bug687.check @@ -1,11 +1,10 @@ - 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/arybufgrow.scala b/test/files/run/arybufgrow.scala index 35b3233055..9e18435243 100644 --- a/test/files/run/arybufgrow.scala +++ b/test/files/run/arybufgrow.scala @@ -2,7 +2,7 @@ import scala.collection.mutable._; object Test extends Application { val buf = new ArrayBuffer[String]; - for(val i <- List.range(0,1000)) { + for (i <- List.range(0,1000)) { buf += "hello"; } diff --git a/test/files/run/bug594.scala b/test/files/run/bug594.scala index 0c3be3d5de..f923a3cd2a 100644 --- a/test/files/run/bug594.scala +++ b/test/files/run/bug594.scala @@ -2,7 +2,7 @@ object Test { def main(args: Array[String]): Unit = { val array = Array("one", "two", "three") val firstTwo: Array[String] = array.slice(0,2) - for(val x <- firstTwo) + for (x <- firstTwo) Console.println(x) } } diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 44e77e3311..82118f8ece 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -5,7 +5,9 @@ typer superaccessors pickler refchecks +selectiveanf liftcode +selectivecps uncurry tailcalls explicitouter diff --git a/test/files/run/regularpatmat.check b/test/files/run/regularpatmat.check deleted file mode 100644 index 3417d9a98a..0000000000 --- a/test/files/run/regularpatmat.check +++ /dev/null @@ -1,126 +0,0 @@ -pretest -passed ok -testWR_1 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_2 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_3 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_4 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_5 -passed ok -passed ok -passed ok -testWR_6 -passed ok -passed ok -testWR_7 -passed ok -testWR_8 -passed ok -testWS -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWT -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWV -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testBK -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testBM -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -BN preTest: true -testBN -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testBO -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testMZ - bugs #132 #133b #180 #195 #196 #398 #406 #441 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok diff --git a/test/files/run/t2074.scala b/test/files/run/t2074.scala deleted file mode 100644 index 60646be733..0000000000 --- a/test/files/run/t2074.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - List.range(1,11).view.patch(5, List(100,101), 2) -} diff --git a/test/files/run/t2074_2.scala b/test/files/run/t2074_2.scala index 7d1d8181d8..4999552cc4 100644 --- a/test/files/run/t2074_2.scala +++ b/test/files/run/t2074_2.scala @@ -3,6 +3,8 @@ import scala.collection.immutable.IndexedSeq import scala.collection.IndexedSeqView object Test { + val funWithCCE = List.range(1,11).view.patch(5, List(100,101), 2) + val v = new IndexedSeqView[Int, IndexedSeq[Int]] { def underlying = IndexedSeq(1,2,3) def apply(idx: Int) = underlying(idx) diff --git a/test/files/run/t2212.scala b/test/files/run/t2212.scala new file mode 100644 index 0000000000..b9c0cd776b --- /dev/null +++ b/test/files/run/t2212.scala @@ -0,0 +1,10 @@ +object Test { + def main(args: Array[String]) { + import collection.mutable._ + val x4 = LinkedList[Int](1) + println(x4) + val y4 = LinkedList[Int](1) + println(y4) + println(x4 equals y4) // or (y4 equals x4) + } +} diff --git a/test/disabled/run/t2946/Parsers.scala b/test/files/run/t2946/Parsers.scala index c0961034c4..c0961034c4 100755..100644 --- a/test/disabled/run/t2946/Parsers.scala +++ b/test/files/run/t2946/Parsers.scala diff --git a/test/disabled/run/t2946/ResponseCommon.scala b/test/files/run/t2946/ResponseCommon.scala index fa9d8acccb..fa9d8acccb 100755..100644 --- a/test/disabled/run/t2946/ResponseCommon.scala +++ b/test/files/run/t2946/ResponseCommon.scala diff --git a/test/disabled/run/t2946/Test.scala b/test/files/run/t2946/Test.scala index e9d9896a0e..e9d9896a0e 100755..100644 --- a/test/disabled/run/t2946/Test.scala +++ b/test/files/run/t2946/Test.scala diff --git a/test/files/run/unittest_collection.scala b/test/files/run/unittest_collection.scala index 5d7ab97425..d45c23d4b5 100644 --- a/test/files/run/unittest_collection.scala +++ b/test/files/run/unittest_collection.scala @@ -96,7 +96,7 @@ object Test { ) val tr = new TestResult() ts.run(tr) - for(val failure <- tr.failures) { + for (failure <- tr.failures) { Console.println(failure) } } diff --git a/test/files/script/fact.scala b/test/files/script/fact.scala index d48dac6f0f..d48dac6f0f 100644..100755 --- a/test/files/script/fact.scala +++ b/test/files/script/fact.scala diff --git a/test/partest b/test/partest index 1e7da8bd4a..124c4d605e 100755 --- a/test/partest +++ b/test/partest @@ -75,12 +75,23 @@ if $cygwin; then fi # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris -[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx512M -Xms16M" -[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" +[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:MaxPermSize=128M" +[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="" -partestDebugStr="" -if [ ! -z "${PARTEST_DEBUG}" ] ; then - partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}" -fi +export SCALAC_OPTS +export JAVA_OPTS +export JAVACMD + +${JAVACMD:=java} $JAVA_OPTS \ + -cp "$EXT_CLASSPATH" \ + -Dscala.home="${SCALA_HOME}" \ + 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 "$@" +# ${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 "$@" diff --git a/test/partest.bat b/test/partest.bat index 39fe830082..0b5618a164 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.nest.NestRunner %_ARGS%
-%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
+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%
goto end
rem ##########################################################################
diff --git a/test/pending/continuations-run/select-run.log b/test/pending/continuations-run/select-run.log deleted file mode 100644 index 6faa868ce3..0000000000 --- a/test/pending/continuations-run/select-run.log +++ /dev/null @@ -1,20 +0,0 @@ -8 -java.lang.ClassCastException: scala.util.continuations.ControlContext cannot be cast to java.lang.Integer - at scala.runtime.BoxesRunTime.unboxToInt(Unknown Source) - at Test$$anonfun$main$2.apply(select.scala:18) - at Test$$anonfun$main$2.apply(select.scala:18) - at scala.util.continuations.ControlContext$.reset(ControlContext.scala:65) - at Test$.main(select.scala:18) - at Test.main(select.scala) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) - at java.lang.reflect.Method.invoke(Method.java:597) - at scala.tools.nsc.util.ScalaClassLoader$$anonfun$run$1.apply(ScalaClassLoader.scala:55) - at scala.tools.nsc.util.ScalaClassLoader$class.asContext(ScalaClassLoader.scala:22) - at scala.tools.nsc.util.ScalaClassLoader$URLClassLoader.asContext(ScalaClassLoader.scala:61) - at scala.tools.nsc.util.ScalaClassLoader$class.run(ScalaClassLoader.scala:55) - at scala.tools.nsc.util.ScalaClassLoader$URLClassLoader.run(ScalaClassLoader.scala:61) - at scala.tools.nsc.ObjectRunner$.run(ObjectRunner.scala:33) - at scala.tools.nsc.MainGenericRunner$.main(MainGenericRunner.scala:153) - at scala.tools.nsc.MainGenericRunner.main(MainGenericRunner.scala) diff --git a/test/pending/jvm/t1464.check b/test/pending/jvm/t1464.check deleted file mode 100644 index c508d5366f..0000000000 --- a/test/pending/jvm/t1464.check +++ /dev/null @@ -1 +0,0 @@ -false diff --git a/test/files/neg/bug1210.check b/test/pending/neg/bug1210.check index 4db920556f..4db920556f 100644 --- a/test/files/neg/bug1210.check +++ b/test/pending/neg/bug1210.check diff --git a/test/files/pos/t1380/gnujaxp.jar.desired.sha1 b/test/pending/pos/t1380/gnujaxp.jar.desired.sha1 index c155c2aaa2..c155c2aaa2 100644 --- a/test/files/pos/t1380/gnujaxp.jar.desired.sha1 +++ b/test/pending/pos/t1380/gnujaxp.jar.desired.sha1 diff --git a/test/files/pos/t1380/hallo.scala b/test/pending/pos/t1380/hallo.scala index 27ecd9fb8b..27ecd9fb8b 100644 --- a/test/files/pos/t1380/hallo.scala +++ b/test/pending/pos/t1380/hallo.scala diff --git a/test/pending/run/bug2365/run b/test/pending/run/bug2365/run deleted file mode 100755 index f3c44ad086..0000000000 --- a/test/pending/run/bug2365/run +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 deleted file mode 100644 index 814f4a4229..0000000000 --- a/test/pending/run/subarray.check +++ /dev/null @@ -1,2 +0,0 @@ -one -two diff --git a/test/pending/run/bug2365/bug2365.javaopts b/test/pending/script/bug2365.javaopts index 357e033c1c..357e033c1c 100644 --- a/test/pending/run/bug2365/bug2365.javaopts +++ b/test/pending/script/bug2365.javaopts diff --git a/test/pending/run/bug2365/Test.scala b/test/pending/script/bug2365/Test.scala index 92b58f4a25..53581d256b 100644 --- a/test/pending/run/bug2365/Test.scala +++ b/test/pending/script/bug2365/Test.scala @@ -20,11 +20,11 @@ object Test def test(withF0: StructF0 => Int): Int = { // Some large jar - val ivyJar = File("/local/lib/java/ivy.jar").toURL + val jar = File("../../../../lib/scalacheck.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)) + val loader = new java.net.URLClassLoader(Array(File(".").toURL, jar)) // load a real class to fill perm gen space - Class.forName("org.apache.ivy.Ivy", true, loader).newInstance + Class.forName("org.scalacheck.Properties", true, loader).newInstance // create a class from another class loader with an apply: Int method val b = Class.forName("B", true, loader).newInstance diff --git a/test/pending/script/bug2365/bug2365.scala b/test/pending/script/bug2365/bug2365.scala new file mode 100755 index 0000000000..b5e05325cf --- /dev/null +++ b/test/pending/script/bug2365/bug2365.scala @@ -0,0 +1,9 @@ +#!/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. +# + +scalac -cp .:/local/lib/java/ivy.jar Test.scala +JAVA_OPTS="-XX:MaxPermSize=25M -verbose:gc" scalac -cp $CP Test diff --git a/test/files/jvm/NestedAnnotations.java b/test/support/annotations/NestedAnnotations.java index 8f2327dcce..8f2327dcce 100644 --- a/test/files/jvm/NestedAnnotations.java +++ b/test/support/annotations/NestedAnnotations.java diff --git a/test/files/jvm/OuterEnum.java b/test/support/annotations/OuterEnum.java index 75d3f34223..75d3f34223 100644 --- a/test/files/jvm/OuterEnum.java +++ b/test/support/annotations/OuterEnum.java diff --git a/test/files/jvm/OuterTParams.java b/test/support/annotations/OuterTParams.java index 1d3db49fcf..1d3db49fcf 100644 --- a/test/files/jvm/OuterTParams.java +++ b/test/support/annotations/OuterTParams.java diff --git a/test/files/jvm/SourceAnnotation.java b/test/support/annotations/SourceAnnotation.java index 047751ddfe..047751ddfe 100644 --- a/test/files/jvm/SourceAnnotation.java +++ b/test/support/annotations/SourceAnnotation.java diff --git a/test/files/jvm/mkAnnotationsJar.sh b/test/support/annotations/mkAnnotationsJar.sh index 3d69351165..3d69351165 100755 --- a/test/files/jvm/mkAnnotationsJar.sh +++ b/test/support/annotations/mkAnnotationsJar.sh |