From e8a121e9e1ade3f283f42fceb3c18f30a8468f57 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Mon, 5 Apr 2010 06:24:22 +0000
Subject: If I work on this patch any longer without chec...

If I work on this patch any longer without checking in I will go
stark raving mad. It is broken up into a couple pieces. This one is
the changes to test/. It includes fixing a bunch of tests, removing
deprecated constructs, moving jars used by tests to the most specific
plausible location rather than having all jars on the classpath of all
tests, and some filesystem layout change (continuations get their whole
own srcpath.) This would be the world's most tedious review, so let's
say no review.

[Note: after this commit, I doubt things will build very smoothly until
the rest of the partest changes follow. Which should only be seconds,
but just in case.]
---
 test/files/bench/equality/eqeq.eqlog               |  42 +++++++
 test/files/bench/equality/eqeq.log                 |  42 -------
 .../buildmanager/t2653/t2653.changes/A2.scala      |   1 -
 test/files/cli/test1/Main.check.j9vm5              |   4 -
 test/files/cli/test1/Main.check.java               |   6 -
 test/files/cli/test1/Main.check.java5              |   6 -
 test/files/cli/test1/Main.check.java5_api          |  19 ----
 test/files/cli/test1/Main.check.java5_j9           |   4 -
 test/files/cli/test1/Main.check.javac              |  19 ----
 test/files/cli/test1/Main.check.javac5             |  24 ----
 test/files/cli/test1/Main.check.javac6             |  29 -----
 test/files/cli/test1/Main.check.jikes              |   3 -
 test/files/cli/test1/Main.check.jikes5             |   3 -
 test/files/cli/test1/Main.check.scala              |  24 ----
 test/files/cli/test1/Main.check.scala_api          |  33 ------
 test/files/cli/test1/Main.check.scala_j9           |  15 ---
 test/files/cli/test1/Main.check.scalac             |  63 -----------
 test/files/cli/test1/Main.check.scalaint           |  45 --------
 test/files/cli/test1/Main.java                     |   8 --
 test/files/cli/test1/Main.scala                    |   8 --
 test/files/cli/test2/Main.check.j9vm5              |   4 -
 test/files/cli/test2/Main.check.java               |   6 -
 test/files/cli/test2/Main.check.java5              |   6 -
 test/files/cli/test2/Main.check.java5_api          |  24 ----
 test/files/cli/test2/Main.check.java5_j9           |  36 ------
 test/files/cli/test2/Main.check.javac              |  27 -----
 test/files/cli/test2/Main.check.javac5             |  28 -----
 test/files/cli/test2/Main.check.javac6             |  33 ------
 test/files/cli/test2/Main.check.jikes              |   9 --
 test/files/cli/test2/Main.check.jikes5             |   9 --
 test/files/cli/test2/Main.check.scala              |  24 ----
 test/files/cli/test2/Main.check.scala_api          |  37 ------
 test/files/cli/test2/Main.check.scala_j9           |  15 ---
 test/files/cli/test2/Main.check.scalac             |  63 -----------
 test/files/cli/test2/Main.check.scalaint           |  45 --------
 test/files/cli/test2/Main.java                     |   8 --
 test/files/cli/test2/Main.scala                    |   8 --
 test/files/cli/test3/Main.check.j9vm5              |   5 -
 test/files/cli/test3/Main.check.java               |  10 --
 test/files/cli/test3/Main.check.java5              |  10 --
 test/files/cli/test3/Main.check.java5_api          |  29 -----
 test/files/cli/test3/Main.check.java5_j9           |  36 ------
 test/files/cli/test3/Main.check.javac              |  33 ------
 test/files/cli/test3/Main.check.javac5             |  31 -----
 test/files/cli/test3/Main.check.javac6             |  36 ------
 test/files/cli/test3/Main.check.jikes              |  14 ---
 test/files/cli/test3/Main.check.jikes5             |  14 ---
 test/files/cli/test3/Main.check.scala              |  28 -----
 test/files/cli/test3/Main.check.scala_api          |  41 -------
 test/files/cli/test3/Main.check.scala_j9           |  19 ----
 test/files/cli/test3/Main.check.scalac             |  63 -----------
 test/files/cli/test3/Main.check.scalaint           |  48 --------
 test/files/cli/test3/Main.java                     |  10 --
 test/files/cli/test3/Main.scala                    |  10 --
 test/files/continuations-neg/function0.check       |   6 -
 test/files/continuations-neg/function0.scala       |  16 ---
 test/files/continuations-neg/function2.check       |   6 -
 test/files/continuations-neg/function2.scala       |  16 ---
 test/files/continuations-neg/function3.check       |   6 -
 test/files/continuations-neg/function3.scala       |  15 ---
 test/files/continuations-neg/infer0.check          |   4 -
 test/files/continuations-neg/infer0.scala          |  14 ---
 test/files/continuations-neg/infer2.check          |   4 -
 test/files/continuations-neg/infer2.scala          |  19 ----
 test/files/continuations-neg/lazy.check            |   6 -
 test/files/continuations-neg/lazy.scala            |  16 ---
 test/files/continuations-neg/t1929.check           |   6 -
 test/files/continuations-neg/t1929.scala           |  17 ---
 test/files/continuations-neg/t2285.check           |   6 -
 test/files/continuations-neg/t2285.scala           |  11 --
 test/files/continuations-neg/t2949.check           |   6 -
 test/files/continuations-neg/t2949.scala           |  15 ---
 test/files/continuations-neg/trycatch2.check       |   7 --
 test/files/continuations-neg/trycatch2.scala       |  33 ------
 test/files/continuations-run/basics.check          |   2 -
 test/files/continuations-run/basics.scala          |  23 ----
 test/files/continuations-run/function1.check       |   1 -
 test/files/continuations-run/function1.scala       |  16 ---
 test/files/continuations-run/function4.check       |   1 -
 test/files/continuations-run/function4.scala       |  15 ---
 test/files/continuations-run/function5.check       |   1 -
 test/files/continuations-run/function5.scala       |  15 ---
 test/files/continuations-run/function6.check       |   1 -
 test/files/continuations-run/function6.scala       |  16 ---
 test/files/continuations-run/ifelse0.check         |   2 -
 test/files/continuations-run/ifelse0.scala         |  18 ---
 test/files/continuations-run/ifelse1.check         |   4 -
 test/files/continuations-run/ifelse1.scala         |  25 ----
 test/files/continuations-run/ifelse2.check         |   4 -
 test/files/continuations-run/ifelse2.scala         |  16 ---
 test/files/continuations-run/ifelse3.check         |   2 -
 test/files/continuations-run/ifelse3.scala         |  21 ----
 test/files/continuations-run/infer1.scala          |  33 ------
 test/files/continuations-run/match0.check          |   2 -
 test/files/continuations-run/match0.scala          |  18 ---
 test/files/continuations-run/match1.check          |   2 -
 test/files/continuations-run/match1.scala          |  18 ---
 test/files/continuations-run/match2.check          |   2 -
 test/files/continuations-run/match2.scala          |  26 -----
 test/files/continuations-run/t1807.check           |   1 -
 test/files/continuations-run/t1807.scala           |  14 ---
 test/files/continuations-run/t1808.scala           |  10 --
 test/files/continuations-run/t1820.scala           |  14 ---
 test/files/continuations-run/t1821.check           |   4 -
 test/files/continuations-run/t1821.scala           |  20 ----
 test/files/continuations-run/t2864.check           |   1 -
 test/files/continuations-run/t2864.scala           |  30 -----
 test/files/continuations-run/t2934.check           |   1 -
 test/files/continuations-run/t2934.scala           |  10 --
 test/files/continuations-run/t3199.check           |   1 -
 test/files/continuations-run/t3199.scala           |  20 ----
 test/files/continuations-run/t3199b.check          |   1 -
 test/files/continuations-run/t3199b.scala          |  11 --
 test/files/continuations-run/t3223.check           |   1 -
 test/files/continuations-run/t3223.scala           |  19 ----
 test/files/continuations-run/t3225.check           |  12 --
 test/files/continuations-run/t3225.scala           |  56 ---------
 test/files/continuations-run/trycatch0.check       |   2 -
 test/files/continuations-run/trycatch0.scala       |  25 ----
 test/files/continuations-run/trycatch1.check       |   4 -
 test/files/continuations-run/trycatch1.scala       |  48 --------
 test/files/continuations-run/while0.check          |   1 -
 test/files/continuations-run/while0.scala          |  22 ----
 test/files/continuations-run/while1.check          |  11 --
 test/files/continuations-run/while1.scala          |  22 ----
 test/files/continuations-run/while2.check          |  19 ----
 test/files/continuations-run/while2.scala          |  23 ----
 test/files/files.iml                               |  17 ---
 test/files/jvm/NestedAnnotations.java              |  25 ----
 test/files/jvm/OuterEnum.java                      |   5 -
 test/files/jvm/OuterTParams.java                   |   6 -
 test/files/jvm/SourceAnnotation.java               |   9 --
 test/files/jvm/deprecation.cmds                    |   3 +
 test/files/jvm/genericNest.scala                   |  13 ---
 .../jvm/genericNest/genericNest.jar.desired.sha1   |   1 +
 test/files/jvm/genericNest/genericNest.scala       |  13 +++
 test/files/jvm/inner.scala                         |   2 +-
 test/files/jvm/lib/annotations.jar.desired.sha1    |   1 +
 test/files/jvm/lib/nest.jar.desired.sha1           |   1 +
 test/files/jvm/methvsfield.java                    |  11 --
 test/files/jvm/methvsfield.scala                   |   4 -
 .../jvm/methvsfield/methvsfield.jar.desired.sha1   |   1 +
 test/files/jvm/methvsfield/methvsfield.java        |  11 ++
 test/files/jvm/methvsfield/methvsfield.scala       |   4 +
 test/files/jvm/mkAnnotationsJar.sh                 |  28 -----
 test/files/jvm/nest.java                           |  38 -------
 test/files/jvm/nest.scala                          |  21 ----
 test/files/jvm/nest/nest.java                      |  38 +++++++
 test/files/jvm/nest/nest.scala                     |  21 ++++
 test/files/jvm/outerEnum.scala                     |   9 --
 test/files/jvm/outerEnum/enums.jar.desired.sha1    |   1 +
 test/files/jvm/outerEnum/outerEnum.scala           |   9 ++
 test/files/jvm/t1652.check                         |   2 -
 test/files/jvm/t2470.cmds                          |   3 +
 test/files/jvm/t3003.cmds                          |   2 +
 test/files/jvm/unittest_io.scala                   |   2 +-
 test/files/lib/annotations.jar.desired.sha1        |   1 -
 test/files/lib/enums.jar.desired.sha1              |   1 -
 test/files/lib/genericNest.jar.desired.sha1        |   1 -
 test/files/lib/methvsfield.jar.desired.sha1        |   1 -
 test/files/lib/nest.jar.desired.sha1               |   1 -
 .../lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1   |   1 -
 test/files/neg/bug1210.check                       |   7 --
 test/files/neg/bug1279a.check                      |   6 -
 test/files/neg/bug414.check                        |   5 -
 test/files/neg/bug961.check                        |   5 -
 test/files/neg/bug961.scala                        |   6 +-
 test/files/neg/migration28.check                   |   3 +-
 test/files/neg/multi-array.flags                   |   1 +
 test/files/neg/t3115.flags                         |   2 +-
 test/files/pos/bug715.cmds                         |   2 +
 test/files/pos/spec-partially.flags                |   2 +-
 test/files/pos/super.cmds                          |   2 +
 test/files/pos/switchUnbox.flags                   |   2 +-
 test/files/pos/t0971.java                          |   4 -
 test/files/pos/t1029.cmds                          |   2 +
 test/files/pos/t1380.flags                         |   1 -
 test/files/pos/t1380/gnujaxp.jar.desired.sha1      |   1 -
 test/files/pos/t1380/hallo.scala                   |   3 -
 test/files/pos/t1751.cmds                          |   3 +
 test/files/pos/t1782.cmds                          |   2 +
 test/files/pos/t1942.cmds                          |   2 +
 test/files/pos/t2464.cmds                          |   3 +
 test/files/pos/t2726.cmds                          |   2 +
 test/files/pos/t2868.cmds                          |   3 +
 test/files/pos/t294.cmds                           |   3 +
 test/files/res/bug687.check                        |   5 +-
 test/files/run/arybufgrow.scala                    |   2 +-
 test/files/run/bug594.scala                        |   2 +-
 test/files/run/programmatic-main.check             |   2 +
 test/files/run/regularpatmat.check                 | 126 ---------------------
 test/files/run/t2074.scala                         |   3 -
 test/files/run/t2074_2.scala                       |   2 +
 test/files/run/t2212.scala                         |  10 ++
 test/files/run/t2946/Parsers.scala                 |   4 +
 test/files/run/t2946/ResponseCommon.scala          |  14 +++
 test/files/run/t2946/Test.scala                    |   7 ++
 test/files/run/unittest_collection.scala           |   2 +-
 test/files/script/fact.scala                       |   0
 test/files/script/loadAndExecute/lAndE1.scala      |   3 -
 test/files/script/loadAndExecute/lAndE2.scala      |   1 -
 .../script/loadAndExecute/loadAndExecute.check     |   1 -
 .../script/loadAndExecute/loadAndExecute.scala     |   3 -
 test/files/script/utf8.bat                         |  11 --
 test/files/script/utf8.check                       |   2 -
 test/files/script/utf8.scala                       |  27 -----
 206 files changed, 230 insertions(+), 2509 deletions(-)
 create mode 100644 test/files/bench/equality/eqeq.eqlog
 delete mode 100755 test/files/bench/equality/eqeq.log
 delete mode 100644 test/files/cli/test1/Main.check.j9vm5
 delete mode 100644 test/files/cli/test1/Main.check.java
 delete mode 100644 test/files/cli/test1/Main.check.java5
 delete mode 100644 test/files/cli/test1/Main.check.java5_api
 delete mode 100644 test/files/cli/test1/Main.check.java5_j9
 delete mode 100644 test/files/cli/test1/Main.check.javac
 delete mode 100644 test/files/cli/test1/Main.check.javac5
 delete mode 100644 test/files/cli/test1/Main.check.javac6
 delete mode 100644 test/files/cli/test1/Main.check.jikes
 delete mode 100644 test/files/cli/test1/Main.check.jikes5
 delete mode 100644 test/files/cli/test1/Main.check.scala
 delete mode 100644 test/files/cli/test1/Main.check.scala_api
 delete mode 100644 test/files/cli/test1/Main.check.scala_j9
 delete mode 100644 test/files/cli/test1/Main.check.scalac
 delete mode 100644 test/files/cli/test1/Main.check.scalaint
 delete mode 100644 test/files/cli/test1/Main.java
 delete mode 100644 test/files/cli/test1/Main.scala
 delete mode 100644 test/files/cli/test2/Main.check.j9vm5
 delete mode 100644 test/files/cli/test2/Main.check.java
 delete mode 100644 test/files/cli/test2/Main.check.java5
 delete mode 100644 test/files/cli/test2/Main.check.java5_api
 delete mode 100644 test/files/cli/test2/Main.check.java5_j9
 delete mode 100644 test/files/cli/test2/Main.check.javac
 delete mode 100644 test/files/cli/test2/Main.check.javac5
 delete mode 100644 test/files/cli/test2/Main.check.javac6
 delete mode 100644 test/files/cli/test2/Main.check.jikes
 delete mode 100644 test/files/cli/test2/Main.check.jikes5
 delete mode 100644 test/files/cli/test2/Main.check.scala
 delete mode 100644 test/files/cli/test2/Main.check.scala_api
 delete mode 100644 test/files/cli/test2/Main.check.scala_j9
 delete mode 100644 test/files/cli/test2/Main.check.scalac
 delete mode 100644 test/files/cli/test2/Main.check.scalaint
 delete mode 100644 test/files/cli/test2/Main.java
 delete mode 100644 test/files/cli/test2/Main.scala
 delete mode 100644 test/files/cli/test3/Main.check.j9vm5
 delete mode 100644 test/files/cli/test3/Main.check.java
 delete mode 100644 test/files/cli/test3/Main.check.java5
 delete mode 100644 test/files/cli/test3/Main.check.java5_api
 delete mode 100644 test/files/cli/test3/Main.check.java5_j9
 delete mode 100644 test/files/cli/test3/Main.check.javac
 delete mode 100644 test/files/cli/test3/Main.check.javac5
 delete mode 100644 test/files/cli/test3/Main.check.javac6
 delete mode 100644 test/files/cli/test3/Main.check.jikes
 delete mode 100644 test/files/cli/test3/Main.check.jikes5
 delete mode 100644 test/files/cli/test3/Main.check.scala
 delete mode 100644 test/files/cli/test3/Main.check.scala_api
 delete mode 100644 test/files/cli/test3/Main.check.scala_j9
 delete mode 100644 test/files/cli/test3/Main.check.scalac
 delete mode 100644 test/files/cli/test3/Main.check.scalaint
 delete mode 100644 test/files/cli/test3/Main.java
 delete mode 100644 test/files/cli/test3/Main.scala
 delete mode 100644 test/files/continuations-neg/function0.check
 delete mode 100644 test/files/continuations-neg/function0.scala
 delete mode 100644 test/files/continuations-neg/function2.check
 delete mode 100644 test/files/continuations-neg/function2.scala
 delete mode 100644 test/files/continuations-neg/function3.check
 delete mode 100644 test/files/continuations-neg/function3.scala
 delete mode 100644 test/files/continuations-neg/infer0.check
 delete mode 100644 test/files/continuations-neg/infer0.scala
 delete mode 100644 test/files/continuations-neg/infer2.check
 delete mode 100644 test/files/continuations-neg/infer2.scala
 delete mode 100644 test/files/continuations-neg/lazy.check
 delete mode 100644 test/files/continuations-neg/lazy.scala
 delete mode 100644 test/files/continuations-neg/t1929.check
 delete mode 100644 test/files/continuations-neg/t1929.scala
 delete mode 100644 test/files/continuations-neg/t2285.check
 delete mode 100644 test/files/continuations-neg/t2285.scala
 delete mode 100644 test/files/continuations-neg/t2949.check
 delete mode 100644 test/files/continuations-neg/t2949.scala
 delete mode 100644 test/files/continuations-neg/trycatch2.check
 delete mode 100644 test/files/continuations-neg/trycatch2.scala
 delete mode 100755 test/files/continuations-run/basics.check
 delete mode 100755 test/files/continuations-run/basics.scala
 delete mode 100644 test/files/continuations-run/function1.check
 delete mode 100644 test/files/continuations-run/function1.scala
 delete mode 100644 test/files/continuations-run/function4.check
 delete mode 100644 test/files/continuations-run/function4.scala
 delete mode 100644 test/files/continuations-run/function5.check
 delete mode 100644 test/files/continuations-run/function5.scala
 delete mode 100644 test/files/continuations-run/function6.check
 delete mode 100644 test/files/continuations-run/function6.scala
 delete mode 100644 test/files/continuations-run/ifelse0.check
 delete mode 100644 test/files/continuations-run/ifelse0.scala
 delete mode 100644 test/files/continuations-run/ifelse1.check
 delete mode 100644 test/files/continuations-run/ifelse1.scala
 delete mode 100644 test/files/continuations-run/ifelse2.check
 delete mode 100644 test/files/continuations-run/ifelse2.scala
 delete mode 100644 test/files/continuations-run/ifelse3.check
 delete mode 100644 test/files/continuations-run/ifelse3.scala
 delete mode 100644 test/files/continuations-run/infer1.scala
 delete mode 100644 test/files/continuations-run/match0.check
 delete mode 100644 test/files/continuations-run/match0.scala
 delete mode 100644 test/files/continuations-run/match1.check
 delete mode 100644 test/files/continuations-run/match1.scala
 delete mode 100644 test/files/continuations-run/match2.check
 delete mode 100644 test/files/continuations-run/match2.scala
 delete mode 100644 test/files/continuations-run/t1807.check
 delete mode 100644 test/files/continuations-run/t1807.scala
 delete mode 100644 test/files/continuations-run/t1808.scala
 delete mode 100644 test/files/continuations-run/t1820.scala
 delete mode 100644 test/files/continuations-run/t1821.check
 delete mode 100644 test/files/continuations-run/t1821.scala
 delete mode 100644 test/files/continuations-run/t2864.check
 delete mode 100644 test/files/continuations-run/t2864.scala
 delete mode 100644 test/files/continuations-run/t2934.check
 delete mode 100644 test/files/continuations-run/t2934.scala
 delete mode 100644 test/files/continuations-run/t3199.check
 delete mode 100644 test/files/continuations-run/t3199.scala
 delete mode 100644 test/files/continuations-run/t3199b.check
 delete mode 100644 test/files/continuations-run/t3199b.scala
 delete mode 100644 test/files/continuations-run/t3223.check
 delete mode 100644 test/files/continuations-run/t3223.scala
 delete mode 100644 test/files/continuations-run/t3225.check
 delete mode 100644 test/files/continuations-run/t3225.scala
 delete mode 100644 test/files/continuations-run/trycatch0.check
 delete mode 100644 test/files/continuations-run/trycatch0.scala
 delete mode 100644 test/files/continuations-run/trycatch1.check
 delete mode 100644 test/files/continuations-run/trycatch1.scala
 delete mode 100644 test/files/continuations-run/while0.check
 delete mode 100644 test/files/continuations-run/while0.scala
 delete mode 100644 test/files/continuations-run/while1.check
 delete mode 100644 test/files/continuations-run/while1.scala
 delete mode 100644 test/files/continuations-run/while2.check
 delete mode 100644 test/files/continuations-run/while2.scala
 delete mode 100644 test/files/files.iml
 delete mode 100644 test/files/jvm/NestedAnnotations.java
 delete mode 100644 test/files/jvm/OuterEnum.java
 delete mode 100644 test/files/jvm/OuterTParams.java
 delete mode 100644 test/files/jvm/SourceAnnotation.java
 create mode 100644 test/files/jvm/deprecation.cmds
 delete mode 100644 test/files/jvm/genericNest.scala
 create mode 100644 test/files/jvm/genericNest/genericNest.jar.desired.sha1
 create mode 100644 test/files/jvm/genericNest/genericNest.scala
 create mode 100644 test/files/jvm/lib/annotations.jar.desired.sha1
 create mode 100644 test/files/jvm/lib/nest.jar.desired.sha1
 delete mode 100644 test/files/jvm/methvsfield.java
 delete mode 100644 test/files/jvm/methvsfield.scala
 create mode 100644 test/files/jvm/methvsfield/methvsfield.jar.desired.sha1
 create mode 100644 test/files/jvm/methvsfield/methvsfield.java
 create mode 100644 test/files/jvm/methvsfield/methvsfield.scala
 delete mode 100755 test/files/jvm/mkAnnotationsJar.sh
 delete mode 100644 test/files/jvm/nest.java
 delete mode 100644 test/files/jvm/nest.scala
 create mode 100644 test/files/jvm/nest/nest.java
 create mode 100644 test/files/jvm/nest/nest.scala
 delete mode 100644 test/files/jvm/outerEnum.scala
 create mode 100644 test/files/jvm/outerEnum/enums.jar.desired.sha1
 create mode 100644 test/files/jvm/outerEnum/outerEnum.scala
 delete mode 100644 test/files/jvm/t1652.check
 create mode 100644 test/files/jvm/t2470.cmds
 create mode 100644 test/files/jvm/t3003.cmds
 delete mode 100644 test/files/lib/annotations.jar.desired.sha1
 delete mode 100644 test/files/lib/enums.jar.desired.sha1
 delete mode 100644 test/files/lib/genericNest.jar.desired.sha1
 delete mode 100644 test/files/lib/methvsfield.jar.desired.sha1
 delete mode 100644 test/files/lib/nest.jar.desired.sha1
 delete mode 100644 test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1
 delete mode 100644 test/files/neg/bug1210.check
 delete mode 100644 test/files/neg/bug1279a.check
 create mode 100644 test/files/neg/multi-array.flags
 create mode 100644 test/files/pos/bug715.cmds
 create mode 100644 test/files/pos/super.cmds
 delete mode 100644 test/files/pos/t0971.java
 create mode 100644 test/files/pos/t1029.cmds
 delete mode 100644 test/files/pos/t1380.flags
 delete mode 100644 test/files/pos/t1380/gnujaxp.jar.desired.sha1
 delete mode 100644 test/files/pos/t1380/hallo.scala
 create mode 100644 test/files/pos/t1751.cmds
 create mode 100644 test/files/pos/t1782.cmds
 create mode 100644 test/files/pos/t1942.cmds
 create mode 100644 test/files/pos/t2464.cmds
 create mode 100644 test/files/pos/t2726.cmds
 create mode 100644 test/files/pos/t2868.cmds
 create mode 100644 test/files/pos/t294.cmds
 delete mode 100644 test/files/run/regularpatmat.check
 delete mode 100644 test/files/run/t2074.scala
 create mode 100644 test/files/run/t2212.scala
 create mode 100644 test/files/run/t2946/Parsers.scala
 create mode 100644 test/files/run/t2946/ResponseCommon.scala
 create mode 100644 test/files/run/t2946/Test.scala
 mode change 100644 => 100755 test/files/script/fact.scala
 delete mode 100755 test/files/script/loadAndExecute/lAndE1.scala
 delete mode 100755 test/files/script/loadAndExecute/lAndE2.scala
 delete mode 100644 test/files/script/loadAndExecute/loadAndExecute.check
 delete mode 100755 test/files/script/loadAndExecute/loadAndExecute.scala
 delete mode 100755 test/files/script/utf8.bat
 delete mode 100644 test/files/script/utf8.check
 delete mode 100755 test/files/script/utf8.scala

(limited to 'test/files')

diff --git a/test/files/bench/equality/eqeq.eqlog b/test/files/bench/equality/eqeq.eqlog
new file mode 100644
index 0000000000..d1e27aceed
--- /dev/null
+++ b/test/files/bench/equality/eqeq.eqlog
@@ -0,0 +1,42 @@
+Banchmark results for testing equality operations:
+eq.scala: Base case, use eq equality only
+eqeq.scala: Test case, use == instead of eq.
+All tests run on Thinkpad T400, 1.6.0_12 client VM.
+Test command: java eq 5 5
+              java eqeq 5 5
+eq.scala, no -optimise
+eq$		109		78		79		63		63
+eq$		94		63		63		78		78
+eq$		94		62		62		62		78
+eq$		94		78		78		78		78
+eq$		94		78		78		78		78
+eq.scala, with -optimise
+eq$		421		63		62		47		63
+eq$		406		62		62		63		62
+eq$		407		62		62		78		63
+eq$		406		63		63		62		62
+eq$		407		62		62		63		47
+eqeq.scala with version of BoxesRuntime as of Nov 13th, no -optimise
+eqeq$		562		516		516		516		515
+eqeq$		547		515		515		531		532
+eqeq$		532		516		516		515		516
+eqeq$		547		531		531		516		531
+eqeq$		547		515		515		516		516
+eqeq.scala with version of BoxesRuntime as of Nov 13th, with -optimise
+eqeq$		1031		390		391		391		391
+eqeq$		1031		391		391		391		390
+eqeq$		1031		390		390		391		391
+eqeq$		1031		406		407		391		390
+eqeq$		1031		390		390		391		391
+eqeq.scala with 1st optimized of Nov 14th, no -optimise
+eqeq$		484		421		438		438		437
+eqeq$		484		438		437		437		438
+eqeq$		469		437		453		454		438
+eqeq$		468		437		438		468		438
+eqeq$		485		437		437		422		438
+eqeq.scala with 1st optimized of Nov 14th, with -optimise
+eqeq$		1016		375		391		375		375
+eqeq$		1016		375		391		390		375
+eqeq$		1016		390		391		375		375
+eqeq$		1015		375		391		390		375
+eqeq$		1016		390		375		375		375
diff --git a/test/files/bench/equality/eqeq.log b/test/files/bench/equality/eqeq.log
deleted file mode 100755
index d1e27aceed..0000000000
--- a/test/files/bench/equality/eqeq.log
+++ /dev/null
@@ -1,42 +0,0 @@
-Banchmark results for testing equality operations:
-eq.scala: Base case, use eq equality only
-eqeq.scala: Test case, use == instead of eq.
-All tests run on Thinkpad T400, 1.6.0_12 client VM.
-Test command: java eq 5 5
-              java eqeq 5 5
-eq.scala, no -optimise
-eq$		109		78		79		63		63
-eq$		94		63		63		78		78
-eq$		94		62		62		62		78
-eq$		94		78		78		78		78
-eq$		94		78		78		78		78
-eq.scala, with -optimise
-eq$		421		63		62		47		63
-eq$		406		62		62		63		62
-eq$		407		62		62		78		63
-eq$		406		63		63		62		62
-eq$		407		62		62		63		47
-eqeq.scala with version of BoxesRuntime as of Nov 13th, no -optimise
-eqeq$		562		516		516		516		515
-eqeq$		547		515		515		531		532
-eqeq$		532		516		516		515		516
-eqeq$		547		531		531		516		531
-eqeq$		547		515		515		516		516
-eqeq.scala with version of BoxesRuntime as of Nov 13th, with -optimise
-eqeq$		1031		390		391		391		391
-eqeq$		1031		391		391		391		390
-eqeq$		1031		390		390		391		391
-eqeq$		1031		406		407		391		390
-eqeq$		1031		390		390		391		391
-eqeq.scala with 1st optimized of Nov 14th, no -optimise
-eqeq$		484		421		438		438		437
-eqeq$		484		438		437		437		438
-eqeq$		469		437		453		454		438
-eqeq$		468		437		438		468		438
-eqeq$		485		437		437		422		438
-eqeq.scala with 1st optimized of Nov 14th, with -optimise
-eqeq$		1016		375		391		375		375
-eqeq$		1016		375		391		390		375
-eqeq$		1016		390		391		375		375
-eqeq$		1015		375		391		390		375
-eqeq$		1016		390		375		375		375
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/cli/test1/Main.check.j9vm5 b/test/files/cli/test1/Main.check.j9vm5
deleted file mode 100644
index de454ef478..0000000000
--- a/test/files/cli/test1/Main.check.j9vm5
+++ /dev/null
@@ -1,4 +0,0 @@
-env: -cpp: No such file or directory
-env: test1.Main: No such file or directory
-env: -cp: No such file or directory
-1: test 3 passed
diff --git a/test/files/cli/test1/Main.check.java b/test/files/cli/test1/Main.check.java
deleted file mode 100644
index 64410de98f..0000000000
--- a/test/files/cli/test1/Main.check.java
+++ /dev/null
@@ -1,6 +0,0 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
-1: test 1 passed (1)
-1: test 2 passed (1)
-1: test 3 passed (1)
-1: test 4 passed (2)
diff --git a/test/files/cli/test1/Main.check.java5 b/test/files/cli/test1/Main.check.java5
deleted file mode 100644
index 64410de98f..0000000000
--- a/test/files/cli/test1/Main.check.java5
+++ /dev/null
@@ -1,6 +0,0 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
-1: test 1 passed (1)
-1: test 2 passed (1)
-1: test 3 passed (1)
-1: test 4 passed (2)
diff --git a/test/files/cli/test1/Main.check.java5_api b/test/files/cli/test1/Main.check.java5_api
deleted file mode 100644
index 8693a5d92f..0000000000
--- a/test/files/cli/test1/Main.check.java5_api
+++ /dev/null
@@ -1,19 +0,0 @@
-|-- allclasses-frame.html
-|-- allclasses-noframe.html
-|-- constant-values.html
-|-- deprecated-list.html
-|-- help-doc.html
-|-- index-all.html
-|-- index.html
-|-- overview-tree.html
-|-- package-list
-|-- resources
-|   `-- inherit.gif
-|-- stylesheet.css
-`-- test1
-    |-- Main.html
-    |-- package-frame.html
-    |-- package-summary.html
-    `-- package-tree.html
-
-2 directories, 15 files
diff --git a/test/files/cli/test1/Main.check.java5_j9 b/test/files/cli/test1/Main.check.java5_j9
deleted file mode 100644
index de454ef478..0000000000
--- a/test/files/cli/test1/Main.check.java5_j9
+++ /dev/null
@@ -1,4 +0,0 @@
-env: -cpp: No such file or directory
-env: test1.Main: No such file or directory
-env: -cp: No such file or directory
-1: test 3 passed
diff --git a/test/files/cli/test1/Main.check.javac b/test/files/cli/test1/Main.check.javac
deleted file mode 100644
index ba25d9b6ca..0000000000
--- a/test/files/cli/test1/Main.check.javac
+++ /dev/null
@@ -1,19 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                        Generate all debugging info
-  -g:none                   Generate no debugging info
-  -g:{lines,vars,source}    Generate only some debugging info
-  -nowarn                   Generate no warnings
-  -verbose                  Output messages about what the compiler is doing
-  -deprecation              Output source locations where deprecated APIs are used
-  -classpath <path>         Specify where to find user class files
-  -sourcepath <path>        Specify where to find input source files
-  -bootclasspath <path>     Override location of bootstrap class files
-  -extdirs <dirs>           Override location of installed extensions
-  -d <directory>            Specify where to place generated class files
-  -encoding <encoding>      Specify character encoding used by source files
-  -source <release>         Provide source compatibility with specified release
-  -target <release>         Generate class files for specific VM version
-  -help                     Print a synopsis of standard options
-
diff --git a/test/files/cli/test1/Main.check.javac5 b/test/files/cli/test1/Main.check.javac5
deleted file mode 100644
index 0cb29d31ff..0000000000
--- a/test/files/cli/test1/Main.check.javac5
+++ /dev/null
@@ -1,24 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                         Generate all debugging info
-  -g:none                    Generate no debugging info
-  -g:{lines,vars,source}     Generate only some debugging info
-  -nowarn                    Generate no warnings
-  -verbose                   Output messages about what the compiler is doing
-  -deprecation               Output source locations where deprecated APIs are used
-  -classpath <path>          Specify where to find user class files
-  -cp <path>                 Specify where to find user class files
-  -sourcepath <path>         Specify where to find input source files
-  -bootclasspath <path>      Override location of bootstrap class files
-  -extdirs <dirs>            Override location of installed extensions
-  -endorseddirs <dirs>       Override location of endorsed standards path
-  -d <directory>             Specify where to place generated class files
-  -encoding <encoding>       Specify character encoding used by source files
-  -source <release>          Provide source compatibility with specified release
-  -target <release>          Generate class files for specific VM version
-  -version                   Version information
-  -help                      Print a synopsis of standard options
-  -X                         Print a synopsis of nonstandard options
-  -J<flag>                   Pass <flag> directly to the runtime system
-
diff --git a/test/files/cli/test1/Main.check.javac6 b/test/files/cli/test1/Main.check.javac6
deleted file mode 100644
index 8f37a05bcb..0000000000
--- a/test/files/cli/test1/Main.check.javac6
+++ /dev/null
@@ -1,29 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                         Generate all debugging info
-  -g:none                    Generate no debugging info
-  -g:{lines,vars,source}     Generate only some debugging info
-  -nowarn                    Generate no warnings
-  -verbose                   Output messages about what the compiler is doing
-  -deprecation               Output source locations where deprecated APIs are used
-  -classpath <path>          Specify where to find user class files and annotation processors
-  -cp <path>                 Specify where to find user class files and annotation processors
-  -sourcepath <path>         Specify where to find input source files
-  -bootclasspath <path>      Override location of bootstrap class files
-  -extdirs <dirs>            Override location of installed extensions
-  -endorseddirs <dirs>       Override location of endorsed standards path
-  -proc:{none, only}         Control whether annotation processing and/or compilation is done.
-  -processor <class>         Name of the annotation processor to run; bypasses default discovery process
-  -processorpath <path>      Specify where to find annotation processors
-  -d <directory>             Specify where to place generated class files
-  -s <directory>             Specify where to place generated source files
-  -encoding <encoding>       Specify character encoding used by source files
-  -source <release>          Provide source compatibility with specified release
-  -target <release>          Generate class files for specific VM version
-  -version                   Version information
-  -help                      Print a synopsis of standard options
-  -A[key[=value]]            Options to pass to annotation processors
-  -X                         Print a synopsis of nonstandard options
-  -J<flag>                   Pass <flag> directly to the runtime system
-
diff --git a/test/files/cli/test1/Main.check.jikes b/test/files/cli/test1/Main.check.jikes
deleted file mode 100644
index cd891689db..0000000000
--- a/test/files/cli/test1/Main.check.jikes
+++ /dev/null
@@ -1,3 +0,0 @@
-Error: "-dd" is an invalid option.
-use: jikes [options] [@files] file.java...
-For more help, try -help or -version.
diff --git a/test/files/cli/test1/Main.check.jikes5 b/test/files/cli/test1/Main.check.jikes5
deleted file mode 100644
index cd891689db..0000000000
--- a/test/files/cli/test1/Main.check.jikes5
+++ /dev/null
@@ -1,3 +0,0 @@
-Error: "-dd" is an invalid option.
-use: jikes [options] [@files] file.java...
-For more help, try -help or -version.
diff --git a/test/files/cli/test1/Main.check.scala b/test/files/cli/test1/Main.check.scala
deleted file mode 100644
index 43b200ae02..0000000000
--- a/test/files/cli/test1/Main.check.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-unknown option: '-cpp'
-scala [ <option> ]... [<torun> <arguments>]
-
-All options to scalac are allowed.  See scalac -help.
-
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
-
-Option -howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-Option -savecompiled requests that the compiled script be saved
-for future use.
-
-Option -nocompdaemon requests that the fsc offline compiler not be used.
-
-Option -Dproperty=value sets a Java system property.
-
-1: test 1 passed (1)
-1: test 2 passed (1)
-1: test 3 passed (1)
-1: test 4 passed (2)
diff --git a/test/files/cli/test1/Main.check.scala_api b/test/files/cli/test1/Main.check.scala_api
deleted file mode 100644
index 6fac39d3f0..0000000000
--- a/test/files/cli/test1/Main.check.scala_api
+++ /dev/null
@@ -1,33 +0,0 @@
-|-- all-classes.html
-|-- index.html
-|-- modules.html
-|-- nav-classes.html
-|-- root-content.html
-|-- scala
-|   |-- Any.html
-|   |-- AnyRef.html
-|   |-- AnyVal.html
-|   |-- Boolean.html
-|   |-- Byte.html
-|   |-- Char.html
-|   |-- Double.html
-|   |-- Float.html
-|   |-- Int.html
-|   |-- Long.html
-|   |-- Nothing.html
-|   |-- Null.html
-|   |-- Short.html
-|   |-- Unit.html
-|   `-- runtime
-|       |-- BoxedFloat.html
-|       |-- BoxedInt.html
-|       |-- BoxedLong.html
-|       `-- BoxedNumber.html
-|-- script.js
-|-- style.css
-|-- test1
-|   `-- Main$object.html
-|-- test1$content.html
-`-- test1$package.html
-
-3 directories, 28 files
diff --git a/test/files/cli/test1/Main.check.scala_j9 b/test/files/cli/test1/Main.check.scala_j9
deleted file mode 100644
index 65d5ddaac4..0000000000
--- a/test/files/cli/test1/Main.check.scala_j9
+++ /dev/null
@@ -1,15 +0,0 @@
-unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
-
-<compiler-option>'s are as for scalac; see scalac -help.
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
--howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-1: test 1 passed (1)
-1: test 2 passed (1)
-1: test 3 passed (1)
-1: test 4 passed (2)
diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac
deleted file mode 100644
index 8465810d0b..0000000000
--- a/test/files/cli/test1/Main.check.scalac
+++ /dev/null
@@ -1,63 +0,0 @@
-scalac error: bad option: '-dd'
-  scalac -help  gives more information
-Usage: scalac <options | source files>
-where possible options include: 
-  -doc                            Generate documentation
-  -g:<g>                          Generate debugging info (none,source,line,vars,notc)
-  -nowarn                         Generate no warnings
-  -noassert                       Generate no assertions and assumptions
-  -verbose                        Output messages about what the compiler is doing
-  -classpath <path>               Specify where to find user class files
-  -sourcepath <path>              Specify where to find input source files
-  -bootclasspath <path>           Override location of bootstrap class files
-  -extdirs <dirs>                 Override location of installed extensions
-  -d <directory>                  Specify where to place generated class files
-  -encoding <encoding>            Specify character encoding used by source files
-  -windowtitle <windowtitle>      Specify window title of generated HTML documentation
-  -documenttitle <documenttitle>  Specify document title of generated HTML documentation
-  -target:<target>                Specify which backend to use (jvm-1.5,msil)
-  -migrate                        Assist in migrating from Scala version 1.0
-  -o <file>                       Name of the output assembly (only relevant with -target:msil)
-  -r <path>                       List of assemblies referenced by the program (only relevant with -target:msil)
-  -debug                          Output debugging messages
-  -deprecation                    enable detailed deprecation warnings
-  -unchecked                      enable detailed unchecked warnings
-  -statistics                     Print compiler statistics
-  -explaintypes                   Explain type errors in more detail
-  -resident                       Compiler stays resident, files to compile are read from standard input
-  -uniqid                         Print identifiers with unique names (debugging option)
-  -printtypes                     Print tree types (debugging option)
-  -prompt                         Display a prompt after each error (debugging option)
-  -noimports                      Compile without any implicit imports
-  -nopredefs                      Compile without any implicit predefined values
-  -skip:<phase>                   Skip <phase>
-  -check:<phase>                  Check the tree at start of <phase>
-  -print:<phase>                  Print out program after <phase>
-  -printer:<printer>              Printer to use (text,html)
-  -printfile <file>               Specify file in which to print trees
-  -graph:<phase>                  Graph the program after <phase>
-  -browse:<phase>                 Browse the abstract syntax tree after <phase>
-  -stop:<phase>                   Stop after phase <phase>
-  -log:<phase>                    Log operations in <phase>
-  -logall                         Log all operations
-  -version                        Print product version and exit
-  -help                           Print a synopsis of standard options
-  -nouescape                      disables handling of \u unicode escapes
-  -Xinline                        Perform inlining when possible
-  -XO                             Optimize. implies -Xinline, -Xcloselim and -Xdce
-  -Xcloselim                      Perform closure elimination
-  -Xdce                           Perform dead code elimination
-  -Xwarndeadcode                  Emit warnings for dead code
-  -XbytecodeRead                  Enable bytecode reader.
-  -Xdetach                        Perform detaching of remote closures
-  -Xshowcls <class>               Show class info
-  -Xshowobj <object>              Show object info
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
-  -Xgenerics                      Use generic Java types
-  -Xprintpos                      Print tree positions (as offsets)
-  -Xscript                        compile script file
-  -Xexperimental                  enable experimental extensions
-  -Xplugtypes                     parse but ignore annotations in more locations
-  -Xkilloption                    optimizes option types
-
-one error found
diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint
deleted file mode 100644
index 88345d1874..0000000000
--- a/test/files/cli/test1/Main.check.scalaint
+++ /dev/null
@@ -1,45 +0,0 @@
-unknown option: '-cpp'
-scala [ <option> ]... [<torun> <arguments>]
-
-All options to scalac are allowed.  See scalac -help.
-
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
-
-Option -howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-Option -savecompiled requests that the compiled script be saved
-for future use.
-
-Option -nocompdaemon requests that the fsc offline compiler not be used.
-
-Option -Dproperty=value sets a Java system property.
-
-
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 1: test 1 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 1: test 2 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 1: test 3 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
diff --git a/test/files/cli/test1/Main.java b/test/files/cli/test1/Main.java
deleted file mode 100644
index 8850b87517..0000000000
--- a/test/files/cli/test1/Main.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// @info no dependency
-package test1;
-public class Main {
-  public static void main(String args[]) {
-    String arg = (args.length > 0) ? args[0] : "?";
-    System.out.println("1: test " + arg + " passed (" + args.length + ")");
-  }
-}
diff --git a/test/files/cli/test1/Main.scala b/test/files/cli/test1/Main.scala
deleted file mode 100644
index f7dd8a0a36..0000000000
--- a/test/files/cli/test1/Main.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-// @info no dependency
-package test1
-object Main {
-  def main(args: Array[String]) = {
-    val arg = if (args != null && args.length > 0) args(0) else "?"
-    Console.println("1: test " + arg + " passed (" + args.length + ")")
-  }
-}
diff --git a/test/files/cli/test2/Main.check.j9vm5 b/test/files/cli/test2/Main.check.j9vm5
deleted file mode 100644
index 8f4fdf8aa1..0000000000
--- a/test/files/cli/test2/Main.check.j9vm5
+++ /dev/null
@@ -1,4 +0,0 @@
-env: -cpp: No such file or directory
-env: test2.Main: No such file or directory
-env: -cp: No such file or directory
-2: 1: test 3 passed
diff --git a/test/files/cli/test2/Main.check.java b/test/files/cli/test2/Main.check.java
deleted file mode 100644
index aca383de3e..0000000000
--- a/test/files/cli/test2/Main.check.java
+++ /dev/null
@@ -1,6 +0,0 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
-2: 1: test 1 passed (1)
-2: 1: test 2 passed (1)
-2: 1: test 3 passed (1)
-2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.java5 b/test/files/cli/test2/Main.check.java5
deleted file mode 100644
index aca383de3e..0000000000
--- a/test/files/cli/test2/Main.check.java5
+++ /dev/null
@@ -1,6 +0,0 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
-2: 1: test 1 passed (1)
-2: 1: test 2 passed (1)
-2: 1: test 3 passed (1)
-2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.java5_api b/test/files/cli/test2/Main.check.java5_api
deleted file mode 100644
index 4ff775c3da..0000000000
--- a/test/files/cli/test2/Main.check.java5_api
+++ /dev/null
@@ -1,24 +0,0 @@
-|-- allclasses-frame.html
-|-- allclasses-noframe.html
-|-- constant-values.html
-|-- deprecated-list.html
-|-- help-doc.html
-|-- index-all.html
-|-- index.html
-|-- overview-tree.html
-|-- package-list
-|-- resources
-|   `-- inherit.gif
-|-- stylesheet.css
-|-- test1
-|   |-- Main.html
-|   |-- package-frame.html
-|   |-- package-summary.html
-|   `-- package-tree.html
-`-- test2
-    |-- Main.html
-    |-- package-frame.html
-    |-- package-summary.html
-    `-- package-tree.html
-
-3 directories, 19 files
diff --git a/test/files/cli/test2/Main.check.java5_j9 b/test/files/cli/test2/Main.check.java5_j9
deleted file mode 100644
index 2dcb6e892a..0000000000
--- a/test/files/cli/test2/Main.check.java5_j9
+++ /dev/null
@@ -1,36 +0,0 @@
-JVMJ9VM007E Command-line option unrecognised: -cpp
-Could not create the Java virtual machine.
-
-Usage: java [-options] class [args...]
-           (to execute a class)
-   or  java [-jar] [-options] jarfile [args...]
-           (to execute a jar file)
-
-where options include:
-    -cp -classpath <directories and zip/jar files separated by :>
-              set search path for application classes and resources
-    -D<name>=<value>
-              set a system property
-    -verbose[:class|gc|jni]
-              enable verbose output
-    -version  print product version
-    -version:<value>
-        require the specified version to run
-    -showversion  print product version and continue
-    -jre-restrict-search | -no-jre-restrict-search
-              include/exclude user private JREs in the version search
-    -agentlib:<libname>[=<options>]
-              load native agent library <libname>, e.g. -agentlib:hprof
-              see also, -agentlib:jdwp=help and -agentlib:hprof=help
-    -agentpath:<pathname>[=<options>]
-              load native agent library by full pathname
-    -javaagent:<jarpath>[=<options>]
-              load Java programming language agent, see java.lang.instrument
-    -? -help  print this help message
-    -X        print help on non-standard options
-    -assert   print help on assert options
-
-The java class is not found:  test2.Main
-The java class is not found:  test2.Main
-The java class is not found:  test2.Main
-The java class is not found:  test2.Main
diff --git a/test/files/cli/test2/Main.check.javac b/test/files/cli/test2/Main.check.javac
deleted file mode 100644
index c40c0a7a89..0000000000
--- a/test/files/cli/test2/Main.check.javac
+++ /dev/null
@@ -1,27 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                        Generate all debugging info
-  -g:none                   Generate no debugging info
-  -g:{lines,vars,source}    Generate only some debugging info
-  -nowarn                   Generate no warnings
-  -verbose                  Output messages about what the compiler is doing
-  -deprecation              Output source locations where deprecated APIs are used
-  -classpath <path>         Specify where to find user class files
-  -sourcepath <path>        Specify where to find input source files
-  -bootclasspath <path>     Override location of bootstrap class files
-  -extdirs <dirs>           Override location of installed extensions
-  -d <directory>            Specify where to place generated class files
-  -encoding <encoding>      Specify character encoding used by source files
-  -source <release>         Provide source compatibility with specified release
-  -target <release>         Generate class files for specific VM version
-  -help                     Print a synopsis of standard options
-
-files/cli/test2/Main.java:6: package test1 does not exist
-    test1.Main.main(args);
-         ^
-1 error
-files/cli/test2/Main.java:6: package test1 does not exist
-    test1.Main.main(args);
-         ^
-1 error
diff --git a/test/files/cli/test2/Main.check.javac5 b/test/files/cli/test2/Main.check.javac5
deleted file mode 100644
index 0ac32b056e..0000000000
--- a/test/files/cli/test2/Main.check.javac5
+++ /dev/null
@@ -1,28 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                         Generate all debugging info
-  -g:none                    Generate no debugging info
-  -g:{lines,vars,source}     Generate only some debugging info
-  -nowarn                    Generate no warnings
-  -verbose                   Output messages about what the compiler is doing
-  -deprecation               Output source locations where deprecated APIs are used
-  -classpath <path>          Specify where to find user class files
-  -cp <path>                 Specify where to find user class files
-  -sourcepath <path>         Specify where to find input source files
-  -bootclasspath <path>      Override location of bootstrap class files
-  -extdirs <dirs>            Override location of installed extensions
-  -endorseddirs <dirs>       Override location of endorsed standards path
-  -d <directory>             Specify where to place generated class files
-  -encoding <encoding>       Specify character encoding used by source files
-  -source <release>          Provide source compatibility with specified release
-  -target <release>          Generate class files for specific VM version
-  -version                   Version information
-  -help                      Print a synopsis of standard options
-  -X                         Print a synopsis of nonstandard options
-  -J<flag>                   Pass <flag> directly to the runtime system
-
-files/cli/test2/Main.java:6: package test1 does not exist
-    test1.Main.main(args);
-         ^
-1 error
diff --git a/test/files/cli/test2/Main.check.javac6 b/test/files/cli/test2/Main.check.javac6
deleted file mode 100644
index 350d3253bc..0000000000
--- a/test/files/cli/test2/Main.check.javac6
+++ /dev/null
@@ -1,33 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                         Generate all debugging info
-  -g:none                    Generate no debugging info
-  -g:{lines,vars,source}     Generate only some debugging info
-  -nowarn                    Generate no warnings
-  -verbose                   Output messages about what the compiler is doing
-  -deprecation               Output source locations where deprecated APIs are used
-  -classpath <path>          Specify where to find user class files and annotation processors
-  -cp <path>                 Specify where to find user class files and annotation processors
-  -sourcepath <path>         Specify where to find input source files
-  -bootclasspath <path>      Override location of bootstrap class files
-  -extdirs <dirs>            Override location of installed extensions
-  -endorseddirs <dirs>       Override location of endorsed standards path
-  -proc:{none, only}         Control whether annotation processing and/or compilation is done.
-  -processor <class>         Name of the annotation processor to run; bypasses default discovery process
-  -processorpath <path>      Specify where to find annotation processors
-  -d <directory>             Specify where to place generated class files
-  -s <directory>             Specify where to place generated source files
-  -encoding <encoding>       Specify character encoding used by source files
-  -source <release>          Provide source compatibility with specified release
-  -target <release>          Generate class files for specific VM version
-  -version                   Version information
-  -help                      Print a synopsis of standard options
-  -A[key[=value]]            Options to pass to annotation processors
-  -X                         Print a synopsis of nonstandard options
-  -J<flag>                   Pass <flag> directly to the runtime system
-
-files/cli/test2/Main.java:5: package test1 does not exist
-    test1.Main.main(args);
-         ^
-1 error
diff --git a/test/files/cli/test2/Main.check.jikes b/test/files/cli/test2/Main.check.jikes
deleted file mode 100644
index 97943e8347..0000000000
--- a/test/files/cli/test2/Main.check.jikes
+++ /dev/null
@@ -1,9 +0,0 @@
-Error: "-dd" is an invalid option.
-use: jikes [options] [@files] file.java...
-For more help, try -help or -version.
-
-Found 1 semantic error compiling "files/cli/test2/Main.java":
-
-     6.     test1.Main.main(args);
-            ^---^
-*** Semantic Error: No accessible field named "test1" was found in type "test2.Main".
diff --git a/test/files/cli/test2/Main.check.jikes5 b/test/files/cli/test2/Main.check.jikes5
deleted file mode 100644
index 97943e8347..0000000000
--- a/test/files/cli/test2/Main.check.jikes5
+++ /dev/null
@@ -1,9 +0,0 @@
-Error: "-dd" is an invalid option.
-use: jikes [options] [@files] file.java...
-For more help, try -help or -version.
-
-Found 1 semantic error compiling "files/cli/test2/Main.java":
-
-     6.     test1.Main.main(args);
-            ^---^
-*** Semantic Error: No accessible field named "test1" was found in type "test2.Main".
diff --git a/test/files/cli/test2/Main.check.scala b/test/files/cli/test2/Main.check.scala
deleted file mode 100644
index 7e5f17625b..0000000000
--- a/test/files/cli/test2/Main.check.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-unknown option: '-cpp'
-scala [ <option> ]... [<torun> <arguments>]
-
-All options to scalac are allowed.  See scalac -help.
-
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
-
-Option -howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-Option -savecompiled requests that the compiled script be saved
-for future use.
-
-Option -nocompdaemon requests that the fsc offline compiler not be used.
-
-Option -Dproperty=value sets a Java system property.
-
-2: 1: test 1 passed (1)
-2: 1: test 2 passed (1)
-2: 1: test 3 passed (1)
-2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.scala_api b/test/files/cli/test2/Main.check.scala_api
deleted file mode 100644
index bcb0f0c7fb..0000000000
--- a/test/files/cli/test2/Main.check.scala_api
+++ /dev/null
@@ -1,37 +0,0 @@
-|-- all-classes.html
-|-- index.html
-|-- modules.html
-|-- nav-classes.html
-|-- root-content.html
-|-- scala
-|   |-- Any.html
-|   |-- AnyRef.html
-|   |-- AnyVal.html
-|   |-- Boolean.html
-|   |-- Byte.html
-|   |-- Char.html
-|   |-- Double.html
-|   |-- Float.html
-|   |-- Int.html
-|   |-- Long.html
-|   |-- Nothing.html
-|   |-- Null.html
-|   |-- Short.html
-|   |-- Unit.html
-|   `-- runtime
-|       |-- BoxedFloat.html
-|       |-- BoxedInt.html
-|       |-- BoxedLong.html
-|       `-- BoxedNumber.html
-|-- script.js
-|-- style.css
-|-- test1
-|   `-- Main$object.html
-|-- test1$content.html
-|-- test1$package.html
-|-- test2
-|   `-- Main$object.html
-|-- test2$content.html
-`-- test2$package.html
-
-4 directories, 31 files
diff --git a/test/files/cli/test2/Main.check.scala_j9 b/test/files/cli/test2/Main.check.scala_j9
deleted file mode 100644
index 80cbb50fa9..0000000000
--- a/test/files/cli/test2/Main.check.scala_j9
+++ /dev/null
@@ -1,15 +0,0 @@
-unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
-
-<compiler-option>'s are as for scalac; see scalac -help.
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
--howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-2: 1: test 1 passed (1)
-2: 1: test 2 passed (1)
-2: 1: test 3 passed (1)
-2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
deleted file mode 100644
index 8465810d0b..0000000000
--- a/test/files/cli/test2/Main.check.scalac
+++ /dev/null
@@ -1,63 +0,0 @@
-scalac error: bad option: '-dd'
-  scalac -help  gives more information
-Usage: scalac <options | source files>
-where possible options include: 
-  -doc                            Generate documentation
-  -g:<g>                          Generate debugging info (none,source,line,vars,notc)
-  -nowarn                         Generate no warnings
-  -noassert                       Generate no assertions and assumptions
-  -verbose                        Output messages about what the compiler is doing
-  -classpath <path>               Specify where to find user class files
-  -sourcepath <path>              Specify where to find input source files
-  -bootclasspath <path>           Override location of bootstrap class files
-  -extdirs <dirs>                 Override location of installed extensions
-  -d <directory>                  Specify where to place generated class files
-  -encoding <encoding>            Specify character encoding used by source files
-  -windowtitle <windowtitle>      Specify window title of generated HTML documentation
-  -documenttitle <documenttitle>  Specify document title of generated HTML documentation
-  -target:<target>                Specify which backend to use (jvm-1.5,msil)
-  -migrate                        Assist in migrating from Scala version 1.0
-  -o <file>                       Name of the output assembly (only relevant with -target:msil)
-  -r <path>                       List of assemblies referenced by the program (only relevant with -target:msil)
-  -debug                          Output debugging messages
-  -deprecation                    enable detailed deprecation warnings
-  -unchecked                      enable detailed unchecked warnings
-  -statistics                     Print compiler statistics
-  -explaintypes                   Explain type errors in more detail
-  -resident                       Compiler stays resident, files to compile are read from standard input
-  -uniqid                         Print identifiers with unique names (debugging option)
-  -printtypes                     Print tree types (debugging option)
-  -prompt                         Display a prompt after each error (debugging option)
-  -noimports                      Compile without any implicit imports
-  -nopredefs                      Compile without any implicit predefined values
-  -skip:<phase>                   Skip <phase>
-  -check:<phase>                  Check the tree at start of <phase>
-  -print:<phase>                  Print out program after <phase>
-  -printer:<printer>              Printer to use (text,html)
-  -printfile <file>               Specify file in which to print trees
-  -graph:<phase>                  Graph the program after <phase>
-  -browse:<phase>                 Browse the abstract syntax tree after <phase>
-  -stop:<phase>                   Stop after phase <phase>
-  -log:<phase>                    Log operations in <phase>
-  -logall                         Log all operations
-  -version                        Print product version and exit
-  -help                           Print a synopsis of standard options
-  -nouescape                      disables handling of \u unicode escapes
-  -Xinline                        Perform inlining when possible
-  -XO                             Optimize. implies -Xinline, -Xcloselim and -Xdce
-  -Xcloselim                      Perform closure elimination
-  -Xdce                           Perform dead code elimination
-  -Xwarndeadcode                  Emit warnings for dead code
-  -XbytecodeRead                  Enable bytecode reader.
-  -Xdetach                        Perform detaching of remote closures
-  -Xshowcls <class>               Show class info
-  -Xshowobj <object>              Show object info
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
-  -Xgenerics                      Use generic Java types
-  -Xprintpos                      Print tree positions (as offsets)
-  -Xscript                        compile script file
-  -Xexperimental                  enable experimental extensions
-  -Xplugtypes                     parse but ignore annotations in more locations
-  -Xkilloption                    optimizes option types
-
-one error found
diff --git a/test/files/cli/test2/Main.check.scalaint b/test/files/cli/test2/Main.check.scalaint
deleted file mode 100644
index 89b6766bb5..0000000000
--- a/test/files/cli/test2/Main.check.scalaint
+++ /dev/null
@@ -1,45 +0,0 @@
-unknown option: '-cpp'
-scala [ <option> ]... [<torun> <arguments>]
-
-All options to scalac are allowed.  See scalac -help.
-
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
-
-Option -howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-Option -savecompiled requests that the compiled script be saved
-for future use.
-
-Option -nocompdaemon requests that the fsc offline compiler not be used.
-
-Option -Dproperty=value sets a Java system property.
-
-
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 2: 1: test 1 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 2: 1: test 2 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 2: 1: test 3 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
diff --git a/test/files/cli/test2/Main.java b/test/files/cli/test2/Main.java
deleted file mode 100644
index f6797632bf..0000000000
--- a/test/files/cli/test2/Main.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// @info 1 dependency
-package test2;
-public class Main {
-  public static void main(String args[]) {
-    System.out.print("2: ");
-    test1.Main.main(args);
-  }
-}
diff --git a/test/files/cli/test2/Main.scala b/test/files/cli/test2/Main.scala
deleted file mode 100644
index 1d43759fdf..0000000000
--- a/test/files/cli/test2/Main.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-// @info 1 dependency
-package test2
-object Main {
-  def main(args: Array[String]) = {
-    Console.print("2: ")
-    test1.Main.main(args)
-  }
-}
diff --git a/test/files/cli/test3/Main.check.j9vm5 b/test/files/cli/test3/Main.check.j9vm5
deleted file mode 100644
index a094dc8daf..0000000000
--- a/test/files/cli/test3/Main.check.j9vm5
+++ /dev/null
@@ -1,5 +0,0 @@
-env: -cpp: No such file or directory
-env: test3.Main: No such file or directory
-env: -cp: No such file or directory
-3: 1: test 3 passed
-3: 2: 1: test 3 passed
diff --git a/test/files/cli/test3/Main.check.java b/test/files/cli/test3/Main.check.java
deleted file mode 100644
index de3eb7b136..0000000000
--- a/test/files/cli/test3/Main.check.java
+++ /dev/null
@@ -1,10 +0,0 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
-3: 1: test 1 passed (1)
-3: 2: 1: test 1 passed (1)
-3: 1: test 2 passed (1)
-3: 2: 1: test 2 passed (1)
-3: 1: test 3 passed (1)
-3: 2: 1: test 3 passed (1)
-3: 1: test 4 passed (2)
-3: 2: 1: test 4 passed (2)
diff --git a/test/files/cli/test3/Main.check.java5 b/test/files/cli/test3/Main.check.java5
deleted file mode 100644
index de3eb7b136..0000000000
--- a/test/files/cli/test3/Main.check.java5
+++ /dev/null
@@ -1,10 +0,0 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
-3: 1: test 1 passed (1)
-3: 2: 1: test 1 passed (1)
-3: 1: test 2 passed (1)
-3: 2: 1: test 2 passed (1)
-3: 1: test 3 passed (1)
-3: 2: 1: test 3 passed (1)
-3: 1: test 4 passed (2)
-3: 2: 1: test 4 passed (2)
diff --git a/test/files/cli/test3/Main.check.java5_api b/test/files/cli/test3/Main.check.java5_api
deleted file mode 100644
index f6112211f0..0000000000
--- a/test/files/cli/test3/Main.check.java5_api
+++ /dev/null
@@ -1,29 +0,0 @@
-|-- allclasses-frame.html
-|-- allclasses-noframe.html
-|-- constant-values.html
-|-- deprecated-list.html
-|-- help-doc.html
-|-- index-all.html
-|-- index.html
-|-- overview-tree.html
-|-- package-list
-|-- resources
-|   `-- inherit.gif
-|-- stylesheet.css
-|-- test1
-|   |-- Main.html
-|   |-- package-frame.html
-|   |-- package-summary.html
-|   `-- package-tree.html
-|-- test2
-|   |-- Main.html
-|   |-- package-frame.html
-|   |-- package-summary.html
-|   `-- package-tree.html
-`-- test3
-    |-- Main.html
-    |-- package-frame.html
-    |-- package-summary.html
-    `-- package-tree.html
-
-4 directories, 23 files
diff --git a/test/files/cli/test3/Main.check.java5_j9 b/test/files/cli/test3/Main.check.java5_j9
deleted file mode 100644
index 9e228d7649..0000000000
--- a/test/files/cli/test3/Main.check.java5_j9
+++ /dev/null
@@ -1,36 +0,0 @@
-JVMJ9VM007E Command-line option unrecognised: -cpp
-Could not create the Java virtual machine.
-
-Usage: java [-options] class [args...]
-           (to execute a class)
-   or  java [-jar] [-options] jarfile [args...]
-           (to execute a jar file)
-
-where options include:
-    -cp -classpath <directories and zip/jar files separated by :>
-              set search path for application classes and resources
-    -D<name>=<value>
-              set a system property
-    -verbose[:class|gc|jni]
-              enable verbose output
-    -version  print product version
-    -version:<value>
-        require the specified version to run
-    -showversion  print product version and continue
-    -jre-restrict-search | -no-jre-restrict-search
-              include/exclude user private JREs in the version search
-    -agentlib:<libname>[=<options>]
-              load native agent library <libname>, e.g. -agentlib:hprof
-              see also, -agentlib:jdwp=help and -agentlib:hprof=help
-    -agentpath:<pathname>[=<options>]
-              load native agent library by full pathname
-    -javaagent:<jarpath>[=<options>]
-              load Java programming language agent, see java.lang.instrument
-    -? -help  print this help message
-    -X        print help on non-standard options
-    -assert   print help on assert options
-
-The java class is not found:  test3.Main
-The java class is not found:  test3.Main
-The java class is not found:  test3.Main
-The java class is not found:  test3.Main
diff --git a/test/files/cli/test3/Main.check.javac b/test/files/cli/test3/Main.check.javac
deleted file mode 100644
index 8d235b647b..0000000000
--- a/test/files/cli/test3/Main.check.javac
+++ /dev/null
@@ -1,33 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                        Generate all debugging info
-  -g:none                   Generate no debugging info
-  -g:{lines,vars,source}    Generate only some debugging info
-  -nowarn                   Generate no warnings
-  -verbose                  Output messages about what the compiler is doing
-  -deprecation              Output source locations where deprecated APIs are used
-  -classpath <path>         Specify where to find user class files
-  -sourcepath <path>        Specify where to find input source files
-  -bootclasspath <path>     Override location of bootstrap class files
-  -extdirs <dirs>           Override location of installed extensions
-  -d <directory>            Specify where to place generated class files
-  -encoding <encoding>      Specify character encoding used by source files
-  -source <release>         Provide source compatibility with specified release
-  -target <release>         Generate class files for specific VM version
-  -help                     Print a synopsis of standard options
-
-files/cli/test3/Main.java:6: package test1 does not exist
-    test1.Main.main(args);
-         ^
-files/cli/test3/Main.java:8: package test2 does not exist
-    test2.Main.main(args);
-         ^
-2 errors
-files/cli/test3/Main.java:6: package test1 does not exist
-    test1.Main.main(args);
-         ^
-files/cli/test3/Main.java:8: package test2 does not exist
-    test2.Main.main(args);
-         ^
-2 errors
diff --git a/test/files/cli/test3/Main.check.javac5 b/test/files/cli/test3/Main.check.javac5
deleted file mode 100644
index 3a48fa000e..0000000000
--- a/test/files/cli/test3/Main.check.javac5
+++ /dev/null
@@ -1,31 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                         Generate all debugging info
-  -g:none                    Generate no debugging info
-  -g:{lines,vars,source}     Generate only some debugging info
-  -nowarn                    Generate no warnings
-  -verbose                   Output messages about what the compiler is doing
-  -deprecation               Output source locations where deprecated APIs are used
-  -classpath <path>          Specify where to find user class files
-  -cp <path>                 Specify where to find user class files
-  -sourcepath <path>         Specify where to find input source files
-  -bootclasspath <path>      Override location of bootstrap class files
-  -extdirs <dirs>            Override location of installed extensions
-  -endorseddirs <dirs>       Override location of endorsed standards path
-  -d <directory>             Specify where to place generated class files
-  -encoding <encoding>       Specify character encoding used by source files
-  -source <release>          Provide source compatibility with specified release
-  -target <release>          Generate class files for specific VM version
-  -version                   Version information
-  -help                      Print a synopsis of standard options
-  -X                         Print a synopsis of nonstandard options
-  -J<flag>                   Pass <flag> directly to the runtime system
-
-files/cli/test3/Main.java:6: package test1 does not exist
-    test1.Main.main(args);
-         ^
-files/cli/test3/Main.java:8: package test2 does not exist
-    test2.Main.main(args);
-         ^
-2 errors
diff --git a/test/files/cli/test3/Main.check.javac6 b/test/files/cli/test3/Main.check.javac6
deleted file mode 100644
index 677b950aed..0000000000
--- a/test/files/cli/test3/Main.check.javac6
+++ /dev/null
@@ -1,36 +0,0 @@
-javac: invalid flag: -dd
-Usage: javac <options> <source files>
-where possible options include:
-  -g                         Generate all debugging info
-  -g:none                    Generate no debugging info
-  -g:{lines,vars,source}     Generate only some debugging info
-  -nowarn                    Generate no warnings
-  -verbose                   Output messages about what the compiler is doing
-  -deprecation               Output source locations where deprecated APIs are used
-  -classpath <path>          Specify where to find user class files and annotation processors
-  -cp <path>                 Specify where to find user class files and annotation processors
-  -sourcepath <path>         Specify where to find input source files
-  -bootclasspath <path>      Override location of bootstrap class files
-  -extdirs <dirs>            Override location of installed extensions
-  -endorseddirs <dirs>       Override location of endorsed standards path
-  -proc:{none, only}         Control whether annotation processing and/or compilation is done.
-  -processor <class>         Name of the annotation processor to run; bypasses default discovery process
-  -processorpath <path>      Specify where to find annotation processors
-  -d <directory>             Specify where to place generated class files
-  -s <directory>             Specify where to place generated source files
-  -encoding <encoding>       Specify character encoding used by source files
-  -source <release>          Provide source compatibility with specified release
-  -target <release>          Generate class files for specific VM version
-  -version                   Version information
-  -help                      Print a synopsis of standard options
-  -A[key[=value]]            Options to pass to annotation processors
-  -X                         Print a synopsis of nonstandard options
-  -J<flag>                   Pass <flag> directly to the runtime system
-
-files/cli/test3/Main.java:5: package test1 does not exist
-    test1.Main.main(args);
-         ^
-files/cli/test3/Main.java:7: package test2 does not exist
-    test2.Main.main(args);
-         ^
-2 errors
diff --git a/test/files/cli/test3/Main.check.jikes b/test/files/cli/test3/Main.check.jikes
deleted file mode 100644
index 604333e81a..0000000000
--- a/test/files/cli/test3/Main.check.jikes
+++ /dev/null
@@ -1,14 +0,0 @@
-Error: "-dd" is an invalid option.
-use: jikes [options] [@files] file.java...
-For more help, try -help or -version.
-
-Found 2 semantic errors compiling "files/cli/test3/Main.java":
-
-     6.     test1.Main.main(args);
-            ^---^
-*** Semantic Error: No accessible field named "test1" was found in type "test3.Main".
-
-
-     8.     test2.Main.main(args);
-            ^---^
-*** Semantic Error: No accessible field named "test2" was found in type "test3.Main".
diff --git a/test/files/cli/test3/Main.check.jikes5 b/test/files/cli/test3/Main.check.jikes5
deleted file mode 100644
index 604333e81a..0000000000
--- a/test/files/cli/test3/Main.check.jikes5
+++ /dev/null
@@ -1,14 +0,0 @@
-Error: "-dd" is an invalid option.
-use: jikes [options] [@files] file.java...
-For more help, try -help or -version.
-
-Found 2 semantic errors compiling "files/cli/test3/Main.java":
-
-     6.     test1.Main.main(args);
-            ^---^
-*** Semantic Error: No accessible field named "test1" was found in type "test3.Main".
-
-
-     8.     test2.Main.main(args);
-            ^---^
-*** Semantic Error: No accessible field named "test2" was found in type "test3.Main".
diff --git a/test/files/cli/test3/Main.check.scala b/test/files/cli/test3/Main.check.scala
deleted file mode 100644
index f78729b9a2..0000000000
--- a/test/files/cli/test3/Main.check.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-unknown option: '-cpp'
-scala [ <option> ]... [<torun> <arguments>]
-
-All options to scalac are allowed.  See scalac -help.
-
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
-
-Option -howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-Option -savecompiled requests that the compiled script be saved
-for future use.
-
-Option -nocompdaemon requests that the fsc offline compiler not be used.
-
-Option -Dproperty=value sets a Java system property.
-
-3: 1: test 1 passed (1)
-3: 2: 1: test 1 passed (1)
-3: 1: test 2 passed (1)
-3: 2: 1: test 2 passed (1)
-3: 1: test 3 passed (1)
-3: 2: 1: test 3 passed (1)
-3: 1: test 4 passed (2)
-3: 2: 1: test 4 passed (2)
diff --git a/test/files/cli/test3/Main.check.scala_api b/test/files/cli/test3/Main.check.scala_api
deleted file mode 100644
index 4552819b5b..0000000000
--- a/test/files/cli/test3/Main.check.scala_api
+++ /dev/null
@@ -1,41 +0,0 @@
-|-- all-classes.html
-|-- index.html
-|-- modules.html
-|-- nav-classes.html
-|-- root-content.html
-|-- scala
-|   |-- Any.html
-|   |-- AnyRef.html
-|   |-- AnyVal.html
-|   |-- Boolean.html
-|   |-- Byte.html
-|   |-- Char.html
-|   |-- Double.html
-|   |-- Float.html
-|   |-- Int.html
-|   |-- Long.html
-|   |-- Nothing.html
-|   |-- Null.html
-|   |-- Short.html
-|   |-- Unit.html
-|   `-- runtime
-|       |-- BoxedFloat.html
-|       |-- BoxedInt.html
-|       |-- BoxedLong.html
-|       `-- BoxedNumber.html
-|-- script.js
-|-- style.css
-|-- test1
-|   `-- Main$object.html
-|-- test1$content.html
-|-- test1$package.html
-|-- test2
-|   `-- Main$object.html
-|-- test2$content.html
-|-- test2$package.html
-|-- test3
-|   `-- Main$object.html
-|-- test3$content.html
-`-- test3$package.html
-
-5 directories, 34 files
diff --git a/test/files/cli/test3/Main.check.scala_j9 b/test/files/cli/test3/Main.check.scala_j9
deleted file mode 100644
index 3804c17636..0000000000
--- a/test/files/cli/test3/Main.check.scala_j9
+++ /dev/null
@@ -1,19 +0,0 @@
-unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
-
-<compiler-option>'s are as for scalac; see scalac -help.
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
--howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-3: 1: test 1 passed (1)
-3: 2: 1: test 1 passed (1)
-3: 1: test 2 passed (1)
-3: 2: 1: test 2 passed (1)
-3: 1: test 3 passed (1)
-3: 2: 1: test 3 passed (1)
-3: 1: test 4 passed (2)
-3: 2: 1: test 4 passed (2)
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
deleted file mode 100644
index 8465810d0b..0000000000
--- a/test/files/cli/test3/Main.check.scalac
+++ /dev/null
@@ -1,63 +0,0 @@
-scalac error: bad option: '-dd'
-  scalac -help  gives more information
-Usage: scalac <options | source files>
-where possible options include: 
-  -doc                            Generate documentation
-  -g:<g>                          Generate debugging info (none,source,line,vars,notc)
-  -nowarn                         Generate no warnings
-  -noassert                       Generate no assertions and assumptions
-  -verbose                        Output messages about what the compiler is doing
-  -classpath <path>               Specify where to find user class files
-  -sourcepath <path>              Specify where to find input source files
-  -bootclasspath <path>           Override location of bootstrap class files
-  -extdirs <dirs>                 Override location of installed extensions
-  -d <directory>                  Specify where to place generated class files
-  -encoding <encoding>            Specify character encoding used by source files
-  -windowtitle <windowtitle>      Specify window title of generated HTML documentation
-  -documenttitle <documenttitle>  Specify document title of generated HTML documentation
-  -target:<target>                Specify which backend to use (jvm-1.5,msil)
-  -migrate                        Assist in migrating from Scala version 1.0
-  -o <file>                       Name of the output assembly (only relevant with -target:msil)
-  -r <path>                       List of assemblies referenced by the program (only relevant with -target:msil)
-  -debug                          Output debugging messages
-  -deprecation                    enable detailed deprecation warnings
-  -unchecked                      enable detailed unchecked warnings
-  -statistics                     Print compiler statistics
-  -explaintypes                   Explain type errors in more detail
-  -resident                       Compiler stays resident, files to compile are read from standard input
-  -uniqid                         Print identifiers with unique names (debugging option)
-  -printtypes                     Print tree types (debugging option)
-  -prompt                         Display a prompt after each error (debugging option)
-  -noimports                      Compile without any implicit imports
-  -nopredefs                      Compile without any implicit predefined values
-  -skip:<phase>                   Skip <phase>
-  -check:<phase>                  Check the tree at start of <phase>
-  -print:<phase>                  Print out program after <phase>
-  -printer:<printer>              Printer to use (text,html)
-  -printfile <file>               Specify file in which to print trees
-  -graph:<phase>                  Graph the program after <phase>
-  -browse:<phase>                 Browse the abstract syntax tree after <phase>
-  -stop:<phase>                   Stop after phase <phase>
-  -log:<phase>                    Log operations in <phase>
-  -logall                         Log all operations
-  -version                        Print product version and exit
-  -help                           Print a synopsis of standard options
-  -nouescape                      disables handling of \u unicode escapes
-  -Xinline                        Perform inlining when possible
-  -XO                             Optimize. implies -Xinline, -Xcloselim and -Xdce
-  -Xcloselim                      Perform closure elimination
-  -Xdce                           Perform dead code elimination
-  -Xwarndeadcode                  Emit warnings for dead code
-  -XbytecodeRead                  Enable bytecode reader.
-  -Xdetach                        Perform detaching of remote closures
-  -Xshowcls <class>               Show class info
-  -Xshowobj <object>              Show object info
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
-  -Xgenerics                      Use generic Java types
-  -Xprintpos                      Print tree positions (as offsets)
-  -Xscript                        compile script file
-  -Xexperimental                  enable experimental extensions
-  -Xplugtypes                     parse but ignore annotations in more locations
-  -Xkilloption                    optimizes option types
-
-one error found
diff --git a/test/files/cli/test3/Main.check.scalaint b/test/files/cli/test3/Main.check.scalaint
deleted file mode 100644
index cffa02c5b6..0000000000
--- a/test/files/cli/test3/Main.check.scalaint
+++ /dev/null
@@ -1,48 +0,0 @@
-unknown option: '-cpp'
-scala [ <option> ]... [<torun> <arguments>]
-
-All options to scalac are allowed.  See scalac -help.
-
-<torun>, if present, is an object or script file to run.
-If no <torun> is present, run an interactive interpreter.
-
-Option -howtorun allows explicitly specifying how to run <torun>:
-    script: it is a script file
-    object: it is an object name
-    guess: (the default) try to guess
-
-Option -savecompiled requests that the compiled script be saved
-for future use.
-
-Option -nocompdaemon requests that the fsc offline compiler not be used.
-
-Option -Dproperty=value sets a Java system property.
-
-
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 3: 1: test 1 passed (1)
-3: 2: 1: test 1 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 3: 1: test 2 passed (1)
-3: 2: 1: test 2 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
-This is an interpreter for Scala.
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 3: 1: test 3 passed (1)
-3: 2: 1: test 3 passed (1)
-unnamed0: scala.Unit = ()
-
-scala> 
diff --git a/test/files/cli/test3/Main.java b/test/files/cli/test3/Main.java
deleted file mode 100644
index 208863d012..0000000000
--- a/test/files/cli/test3/Main.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// @info 2 dependency
-package test3;
-public class Main {
-  public static void main(String args[]) {
-    System.out.print("3: ");
-    test1.Main.main(args);
-    System.out.print("3: ");
-    test2.Main.main(args);
-  }
-}
diff --git a/test/files/cli/test3/Main.scala b/test/files/cli/test3/Main.scala
deleted file mode 100644
index 63fc11b771..0000000000
--- a/test/files/cli/test3/Main.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-// @info 2 dependencies
-package test3
-object Main {
-  def main(args: Array[String]) = {
-    Console.print("3: ")
-    test1.Main.main(args)
-    Console.print("3: ")
-    test2.Main.main(args)
-  }
-}
diff --git a/test/files/continuations-neg/function0.check b/test/files/continuations-neg/function0.check
deleted file mode 100644
index 0a66763a0f..0000000000
--- a/test/files/continuations-neg/function0.check
+++ /dev/null
@@ -1,6 +0,0 @@
-function0.scala:11: error: type mismatch;
- found   : () => Int @scala.util.continuations.cpsParam[Int,Int]
- required: () => Int
-    val g: () => Int = f
-                       ^
-one error found
diff --git a/test/files/continuations-neg/function0.scala b/test/files/continuations-neg/function0.scala
deleted file mode 100644
index 4112ee3835..0000000000
--- a/test/files/continuations-neg/function0.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val f = () => shift { k: (Int=>Int) => k(7) }
-    val g: () => Int = f
-
-    println(reset(g()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-neg/function2.check b/test/files/continuations-neg/function2.check
deleted file mode 100644
index 4833057652..0000000000
--- a/test/files/continuations-neg/function2.check
+++ /dev/null
@@ -1,6 +0,0 @@
-function2.scala:11: error: type mismatch;
- found   : () => Int
- required: () => Int @util.continuations.package.cps[Int]
-    val g: () => Int @cps[Int] = f
-                                 ^
-one error found
diff --git a/test/files/continuations-neg/function2.scala b/test/files/continuations-neg/function2.scala
deleted file mode 100644
index ae0fda509d..0000000000
--- a/test/files/continuations-neg/function2.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val f = () => 7
-    val g: () => Int @cps[Int] = f
-
-    println(reset(g()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-neg/function3.check b/test/files/continuations-neg/function3.check
deleted file mode 100644
index 4705ad9ed9..0000000000
--- a/test/files/continuations-neg/function3.check
+++ /dev/null
@@ -1,6 +0,0 @@
-function3.scala:10: error: type mismatch;
- found   : Int @scala.util.continuations.cpsParam[Int,Int]
- required: Int
-    val g: () => Int = () => shift { k: (Int=>Int) => k(7) }
-                                   ^
-one error found
diff --git a/test/files/continuations-neg/function3.scala b/test/files/continuations-neg/function3.scala
deleted file mode 100644
index 0c3f1667e5..0000000000
--- a/test/files/continuations-neg/function3.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val g: () => Int = () => shift { k: (Int=>Int) => k(7) }
-
-    println(reset(g()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-neg/infer0.check b/test/files/continuations-neg/infer0.check
deleted file mode 100644
index 1dd072ef09..0000000000
--- a/test/files/continuations-neg/infer0.check
+++ /dev/null
@@ -1,4 +0,0 @@
-infer0.scala:11: error: cannot cps-transform expression 8: type arguments [Int(8),String,Int] do not conform to method shiftUnit's type parameter bounds [A,B,C >: B]
-    test(8)
-         ^
-one error found
diff --git a/test/files/continuations-neg/infer0.scala b/test/files/continuations-neg/infer0.scala
deleted file mode 100644
index 894d5228b1..0000000000
--- a/test/files/continuations-neg/infer0.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x: => Int @cpsParam[String,Int]) = 7
-
-  def main(args: Array[String]): Any = {
-    test(8)
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-neg/infer2.check b/test/files/continuations-neg/infer2.check
deleted file mode 100644
index 59eb670bc3..0000000000
--- a/test/files/continuations-neg/infer2.check
+++ /dev/null
@@ -1,4 +0,0 @@
-infer2.scala:14: error: illegal answer type modification: scala.util.continuations.cpsParam[String,Int] andThen scala.util.continuations.cpsParam[String,Int]
-    test { sym(); sym() }    
-         ^
-one error found
diff --git a/test/files/continuations-neg/infer2.scala b/test/files/continuations-neg/infer2.scala
deleted file mode 100644
index a890ac1fc4..0000000000
--- a/test/files/continuations-neg/infer2.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x: => Int @cpsParam[String,Int]) = 7
-
-  def sym() = shift { k: (Int => String) => 9 }
-
-
-  def main(args: Array[String]): Any = {
-    test { sym(); sym() }
-  }
-
-}
-
-
diff --git a/test/files/continuations-neg/lazy.check b/test/files/continuations-neg/lazy.check
deleted file mode 100644
index bfa44c59a4..0000000000
--- a/test/files/continuations-neg/lazy.check
+++ /dev/null
@@ -1,6 +0,0 @@
-lazy.scala:5: error: type mismatch;
- found   : Unit @scala.util.continuations.cpsParam[Unit,Unit]
- required: Unit
-  def foo = {
-            ^
-one error found
diff --git a/test/files/continuations-neg/lazy.scala b/test/files/continuations-neg/lazy.scala
deleted file mode 100644
index dffc57ffa0..0000000000
--- a/test/files/continuations-neg/lazy.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-import scala.util.continuations._
-
-object Test {
-
-  def foo = {
-    lazy val x = shift((k:Unit=>Unit)=>k())
-    println(x)
-  }
-
-  def main(args: Array[String]) {
-    reset {
-      foo
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-neg/t1929.check b/test/files/continuations-neg/t1929.check
deleted file mode 100644
index f42c3a1e15..0000000000
--- a/test/files/continuations-neg/t1929.check
+++ /dev/null
@@ -1,6 +0,0 @@
-t1929.scala:8: error: type mismatch;
- found   : Int @scala.util.continuations.cpsParam[String,java.lang.String] @scala.util.continuations.cpsSynth
- required: Int @scala.util.continuations.cpsParam[Int,java.lang.String]
-    reset {
-          ^
-one error found
diff --git a/test/files/continuations-neg/t1929.scala b/test/files/continuations-neg/t1929.scala
deleted file mode 100644
index 02eda9170d..0000000000
--- a/test/files/continuations-neg/t1929.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-  def main(args : Array[String]) {
-    reset {
-      println("up")
-      val x = shift((k:Int=>String) => k(8) + k(2))
-      println("down " + x)
-      val y = shift((k:Int=>String) => k(3))
-      println("down2 " + y)
-      y + x
-  	}
-  }
-}
\ No newline at end of file
diff --git a/test/files/continuations-neg/t2285.check b/test/files/continuations-neg/t2285.check
deleted file mode 100644
index d5dff6a4f2..0000000000
--- a/test/files/continuations-neg/t2285.check
+++ /dev/null
@@ -1,6 +0,0 @@
-t2285.scala:9: error: type mismatch;
- found   : Int @scala.util.continuations.cpsParam[String,String] @scala.util.continuations.cpsSynth
- required: Int @scala.util.continuations.cpsParam[Int,String]
-  def foo() = reset { bar(); 7 }
-                    ^
-one error found
diff --git a/test/files/continuations-neg/t2285.scala b/test/files/continuations-neg/t2285.scala
deleted file mode 100644
index f3c7f4c89c..0000000000
--- a/test/files/continuations-neg/t2285.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-object Test {
-
-  def bar() = shift { k: (String => String) => k("1") }
-
-  def foo() = reset { bar(); 7 }
-
-}
diff --git a/test/files/continuations-neg/t2949.check b/test/files/continuations-neg/t2949.check
deleted file mode 100644
index dd9768807c..0000000000
--- a/test/files/continuations-neg/t2949.check
+++ /dev/null
@@ -1,6 +0,0 @@
-t2949.scala:13: error: type mismatch;
- found   : Int
- required: ? @scala.util.continuations.cpsParam[List[?],Any]
-    x * y
-      ^
-one error found
diff --git a/test/files/continuations-neg/t2949.scala b/test/files/continuations-neg/t2949.scala
deleted file mode 100644
index ce27c7c0e8..0000000000
--- a/test/files/continuations-neg/t2949.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-object Test {
-
-  def reflect[A,B](xs : List[A]) = shift{ xs.flatMap[B, List[B]] }
-  def reify[A, B](x : A @cpsParam[List[A], B]) = reset{ List(x) }
-
-  def main(args: Array[String]): Unit = println(reify {
-    val x = reflect[Int, Int](List(1,2,3))
-    val y = reflect[Int, Int](List(2,4,8))
-    x * y
-  })
-}
diff --git a/test/files/continuations-neg/trycatch2.check b/test/files/continuations-neg/trycatch2.check
deleted file mode 100644
index 5ff2838bad..0000000000
--- a/test/files/continuations-neg/trycatch2.check
+++ /dev/null
@@ -1,7 +0,0 @@
-trycatch2.scala:11: error: only simple cps types allowed in try/catch blocks (found: Int @scala.util.continuations.cpsParam[String,Int])
-  def foo1 = try {
-             ^
-trycatch2.scala:19: error: only simple cps types allowed in try/catch blocks (found: Int @scala.util.continuations.cpsParam[String,Int])
-  def foo2 = try {
-             ^
-two errors found
diff --git a/test/files/continuations-neg/trycatch2.scala b/test/files/continuations-neg/trycatch2.scala
deleted file mode 100644
index 761cee52ac..0000000000
--- a/test/files/continuations-neg/trycatch2.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-object Test {
-
-  def fatal[T]: T = throw new Exception
-  def cpsIntStringInt = shift { k:(Int=>String) => k(3); 7 }
-  def cpsIntIntString = shift { k:(Int=>Int) => k(3); "7" }
-
-  def foo1 = try {
-    fatal[Int]
-    cpsIntStringInt
-  } catch {
-    case ex =>
-      cpsIntStringInt
-  }
-
-  def foo2 = try {
-    fatal[Int]
-    cpsIntStringInt
-  } catch {
-    case ex =>
-      cpsIntStringInt
-  }
-
-
-  def main(args: Array[String]): Unit = {
-    println(reset { foo1; "3" })
-    println(reset { foo2; "3" })
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/basics.check b/test/files/continuations-run/basics.check
deleted file mode 100755
index 54c059fdcb..0000000000
--- a/test/files/continuations-run/basics.check
+++ /dev/null
@@ -1,2 +0,0 @@
-28
-28
\ No newline at end of file
diff --git a/test/files/continuations-run/basics.scala b/test/files/continuations-run/basics.scala
deleted file mode 100755
index 9df209b11c..0000000000
--- a/test/files/continuations-run/basics.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def m0() = {
-    shift((k:Int => Int) => k(k(7))) * 2
-  }
-
-  def m1() = {
-    2 * shift((k:Int => Int) => k(k(7)))
-  }
-
-  def main(args: Array[String]) = {
-
-    println(reset(m0()))
-    println(reset(m1()))
-
-  }
-
-}
diff --git a/test/files/continuations-run/function1.check b/test/files/continuations-run/function1.check
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/test/files/continuations-run/function1.check
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/test/files/continuations-run/function1.scala b/test/files/continuations-run/function1.scala
deleted file mode 100644
index 3b39722e3a..0000000000
--- a/test/files/continuations-run/function1.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val f = () => shift { k: (Int=>Int) => k(7) }
-    val g: () => Int @cps[Int] = f
-
-    println(reset(g()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/function4.check b/test/files/continuations-run/function4.check
deleted file mode 100644
index c7930257df..0000000000
--- a/test/files/continuations-run/function4.check
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/test/files/continuations-run/function4.scala b/test/files/continuations-run/function4.scala
deleted file mode 100644
index b73eedb02c..0000000000
--- a/test/files/continuations-run/function4.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val g: () => Int @cps[Int] = () => shift { k: (Int=>Int) => k(7) }
-
-    println(reset(g()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/function5.check b/test/files/continuations-run/function5.check
deleted file mode 100644
index c7930257df..0000000000
--- a/test/files/continuations-run/function5.check
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/test/files/continuations-run/function5.scala b/test/files/continuations-run/function5.scala
deleted file mode 100644
index a689ccf243..0000000000
--- a/test/files/continuations-run/function5.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val g: () => Int @cps[Int] = () => 7
-
-    println(reset(g()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/function6.check b/test/files/continuations-run/function6.check
deleted file mode 100644
index c7930257df..0000000000
--- a/test/files/continuations-run/function6.check
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/test/files/continuations-run/function6.scala b/test/files/continuations-run/function6.scala
deleted file mode 100644
index 1a2792370a..0000000000
--- a/test/files/continuations-run/function6.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def main(args: Array[String]): Any = {
-
-    val g: PartialFunction[Int, Int @cps[Int]] = { case x => 7 }
-
-    println(reset(g(2)))
-
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/ifelse0.check b/test/files/continuations-run/ifelse0.check
deleted file mode 100644
index f8bc79860d..0000000000
--- a/test/files/continuations-run/ifelse0.check
+++ /dev/null
@@ -1,2 +0,0 @@
-10
-9
\ No newline at end of file
diff --git a/test/files/continuations-run/ifelse0.scala b/test/files/continuations-run/ifelse0.scala
deleted file mode 100644
index e34b86ee84..0000000000
--- a/test/files/continuations-run/ifelse0.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x:Int) = if (x <= 7)
-    shift { k: (Int=>Int) => k(k(k(x))) }
-  else
-    shift { k: (Int=>Int) => k(x) }
-
-  def main(args: Array[String]): Any = {
-    println(reset(1 + test(7)))
-    println(reset(1 + test(8)))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/ifelse1.check b/test/files/continuations-run/ifelse1.check
deleted file mode 100644
index 86a3fbc0c1..0000000000
--- a/test/files/continuations-run/ifelse1.check
+++ /dev/null
@@ -1,4 +0,0 @@
-10
-9
-8
-11
\ No newline at end of file
diff --git a/test/files/continuations-run/ifelse1.scala b/test/files/continuations-run/ifelse1.scala
deleted file mode 100644
index 2ccc1ed730..0000000000
--- a/test/files/continuations-run/ifelse1.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test1(x:Int) = if (x <= 7)
-    shift { k: (Int=>Int) => k(k(k(x))) }
-  else
-    x
-
-  def test2(x:Int) = if (x <= 7)
-    x
-  else
-    shift { k: (Int=>Int) => k(k(k(x))) }
-
-  def main(args: Array[String]): Any = {
-    println(reset(1 + test1(7)))
-    println(reset(1 + test1(8)))
-    println(reset(1 + test2(7)))
-    println(reset(1 + test2(8)))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/ifelse2.check b/test/files/continuations-run/ifelse2.check
deleted file mode 100644
index f97a95b08d..0000000000
--- a/test/files/continuations-run/ifelse2.check
+++ /dev/null
@@ -1,4 +0,0 @@
-abort
-()
-alive
-()
diff --git a/test/files/continuations-run/ifelse2.scala b/test/files/continuations-run/ifelse2.scala
deleted file mode 100644
index 536e350190..0000000000
--- a/test/files/continuations-run/ifelse2.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x:Int) = if (x <= 7)
-    shift { k: (Unit=>Unit) => println("abort") }
-
-  def main(args: Array[String]): Any = {
-    println(reset{ test(7); println("alive") })
-    println(reset{ test(8); println("alive") })
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/ifelse3.check b/test/files/continuations-run/ifelse3.check
deleted file mode 100644
index 95b562c8e6..0000000000
--- a/test/files/continuations-run/ifelse3.check
+++ /dev/null
@@ -1,2 +0,0 @@
-6
-9
diff --git a/test/files/continuations-run/ifelse3.scala b/test/files/continuations-run/ifelse3.scala
deleted file mode 100644
index 5dbd079d1c..0000000000
--- a/test/files/continuations-run/ifelse3.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def util(x: Boolean) = shift { k: (Boolean=>Int) => k(x) }
-
-  def test(x:Int) = if (util(x <= 7))
-    x - 1
-  else
-    x + 1
-
-
-  def main(args: Array[String]): Any = {
-    println(reset(test(7)))
-    println(reset(test(8)))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/infer1.scala b/test/files/continuations-run/infer1.scala
deleted file mode 100644
index a6c6c07215..0000000000
--- a/test/files/continuations-run/infer1.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x: => Int @cpsParam[String,Int]) = 7
-
-  def test2() = {
-    val x = shift { k: (Int => String) => 9 }
-    x
-  }
-
-  def test3(x: => Int @cpsParam[Int,Int]) = 7
-
-
-  def util() = shift { k: (String => String) => "7" }
-
-  def main(args: Array[String]): Any = {
-    test { shift { k: (Int => String) => 9 } }
-    test { shift { k: (Int => String) => 9 }; 2 }
-//    test { shift { k: (Int => String) => 9 }; util() }  <-- doesn't work
-    test { shift { k: (Int => String) => 9 }; util(); 2 }
-
-
-    test { shift { k: (Int => String) => 9 }; { test3(0); 2 } }
-
-    test3 { { test3(0); 2 } }
-
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/match0.check b/test/files/continuations-run/match0.check
deleted file mode 100644
index f8bc79860d..0000000000
--- a/test/files/continuations-run/match0.check
+++ /dev/null
@@ -1,2 +0,0 @@
-10
-9
\ No newline at end of file
diff --git a/test/files/continuations-run/match0.scala b/test/files/continuations-run/match0.scala
deleted file mode 100644
index bd36238d7f..0000000000
--- a/test/files/continuations-run/match0.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x:Int) = x match {
-    case 7 => shift { k: (Int=>Int) => k(k(k(x))) }
-    case 8 => shift { k: (Int=>Int) => k(x) }
-  }
-
-  def main(args: Array[String]): Any = {
-    println(reset(1 + test(7)))
-    println(reset(1 + test(8)))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/match1.check b/test/files/continuations-run/match1.check
deleted file mode 100644
index 73053d3f4f..0000000000
--- a/test/files/continuations-run/match1.check
+++ /dev/null
@@ -1,2 +0,0 @@
-10
-9
diff --git a/test/files/continuations-run/match1.scala b/test/files/continuations-run/match1.scala
deleted file mode 100644
index ea4e219666..0000000000
--- a/test/files/continuations-run/match1.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test(x:Int) = x match {
-    case 7 => shift { k: (Int=>Int) => k(k(k(x))) }
-    case _ => x
-  }
-
-  def main(args: Array[String]): Any = {
-    println(reset(1 + test(7)))
-    println(reset(1 + test(8)))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/match2.check b/test/files/continuations-run/match2.check
deleted file mode 100644
index cbf91349cc..0000000000
--- a/test/files/continuations-run/match2.check
+++ /dev/null
@@ -1,2 +0,0 @@
-B
-B
diff --git a/test/files/continuations-run/match2.scala b/test/files/continuations-run/match2.scala
deleted file mode 100644
index 8d4f04870f..0000000000
--- a/test/files/continuations-run/match2.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def test1() = {
-    val (a, b) = shift { k: (((String,String)) => String) => k("A","B") }
-    b
-  }
-
-  case class Elem[T,U](a: T, b: U)
-
-  def test2() = {
-    val Elem(a,b) = shift { k: (Elem[String,String] => String) => k(Elem("A","B")) }
-    b
-  }
-
-
-  def main(args: Array[String]): Any = {
-    println(reset(test1()))
-    println(reset(test2()))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t1807.check b/test/files/continuations-run/t1807.check
deleted file mode 100644
index 56a6051ca2..0000000000
--- a/test/files/continuations-run/t1807.check
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/test/files/continuations-run/t1807.scala b/test/files/continuations-run/t1807.scala
deleted file mode 100644
index 278b3a9936..0000000000
--- a/test/files/continuations-run/t1807.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-  def main(args: Array[String]): Unit = {
-    val z = reset {
-      val f: (() => Int @cps[Int]) = () => 1
-      f()
-    }
-    println(z)
-  }
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t1808.scala b/test/files/continuations-run/t1808.scala
deleted file mode 100644
index 125c7c1cdf..0000000000
--- a/test/files/continuations-run/t1808.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-  def main(args: Array[String]): Unit = {
-    reset0 { 0 }
-  }
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t1820.scala b/test/files/continuations-run/t1820.scala
deleted file mode 100644
index 893ddab6d1..0000000000
--- a/test/files/continuations-run/t1820.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-  def shifted: Unit @suspendable = shift { (k: Unit => Unit) => () }
-  def test1(b: => Boolean) = {
-    reset {
-      if (b) shifted
-    }
-  }
-  def main(args: Array[String]) = test1(true)
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t1821.check b/test/files/continuations-run/t1821.check
deleted file mode 100644
index f7b76115db..0000000000
--- a/test/files/continuations-run/t1821.check
+++ /dev/null
@@ -1,4 +0,0 @@
-()
-()
-()
-()
\ No newline at end of file
diff --git a/test/files/continuations-run/t1821.scala b/test/files/continuations-run/t1821.scala
deleted file mode 100644
index 0d5fb553be..0000000000
--- a/test/files/continuations-run/t1821.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-  def suspended[A](x: A): A @suspendable = x
-  def test1[A](x: A): A @suspendable = suspended(x) match { case x => x }
-  def test2[A](x: List[A]): A @suspendable = suspended(x) match { case List(x) => x }
-
-  def test3[A](x: A): A @suspendable = x match { case x => x }
-  def test4[A](x: List[A]): A @suspendable = x match { case List(x) => x }
-
-  def main(args: Array[String]) = {
-    println(reset(test1()))
-    println(reset(test2(List(()))))
-    println(reset(test3()))
-    println(reset(test4(List(()))))
-  }
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t2864.check b/test/files/continuations-run/t2864.check
deleted file mode 100644
index d411bb7c1a..0000000000
--- a/test/files/continuations-run/t2864.check
+++ /dev/null
@@ -1 +0,0 @@
-400
diff --git a/test/files/continuations-run/t2864.scala b/test/files/continuations-run/t2864.scala
deleted file mode 100644
index 7a2579e45c..0000000000
--- a/test/files/continuations-run/t2864.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-import scala.util.continuations._
-object Test {
-
-  def double[B](n : Int)(k : Int => B) : B = k(n * 2)
-
-  def main(args : Array[String]) {
-     reset {
-       val result1 = shift(double[Unit](100))
-       val result2 = shift(double[Unit](result1))
-       println(result2)
-     }
-  }
-
-  def foo: Int @cps[Int] = {
-    val a0 = shift((k:Int=>Int) => k(0))
-    val x0 = 2
-    val a1 = shift((k:Int=>Int) => x0)
-    0
-  }
-
-/*
-  def bar: ControlContext[Int,Int,Int] = {
-    shiftR((k:Int=>Int) => k(0)).flatMap { a0 =>
-    val x0 = 2
-    shiftR((k:Int=>Int) => x0).map { a1 =>
-    0
-    }}
-  }
-*/
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t2934.check b/test/files/continuations-run/t2934.check
deleted file mode 100644
index a92586538e..0000000000
--- a/test/files/continuations-run/t2934.check
+++ /dev/null
@@ -1 +0,0 @@
-List(3, 4, 5)
diff --git a/test/files/continuations-run/t2934.scala b/test/files/continuations-run/t2934.scala
deleted file mode 100644
index a1b8ca9e04..0000000000
--- a/test/files/continuations-run/t2934.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-import scala.util.continuations._
-
-object Test {
-  def main(args : Array[String]) {
-   println(reset {
-     val x = shift(List(1,2,3).flatMap[Int, List[Int]])
-     List(x + 2)
-   })
-  }
-}
diff --git a/test/files/continuations-run/t3199.check b/test/files/continuations-run/t3199.check
deleted file mode 100644
index a065247b8c..0000000000
--- a/test/files/continuations-run/t3199.check
+++ /dev/null
@@ -1 +0,0 @@
-Right(7)
diff --git a/test/files/continuations-run/t3199.scala b/test/files/continuations-run/t3199.scala
deleted file mode 100644
index 3fd2f1959a..0000000000
--- a/test/files/continuations-run/t3199.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-import _root_.scala.collection.Seq
-import _root_.scala.util.control.Exception
-import _root_.scala.util.continuations._
-
-object Test {
-
-  trait AbstractResource[+R <: AnyRef]  {
-    def reflect[B] : R @cpsParam[B,Either[Throwable, B]] = shift(acquireFor)
-    def acquireFor[B](f :  R => B) : Either[Throwable, B] = {
-	      import Exception._
-	      catching(List(classOf[Throwable]) : _*) either (f(null.asInstanceOf[R]))
-	    }
-	  }
-
-	  def main(args: Array[String]) : Unit = {
-	     val x = new AbstractResource[String] { }
-	     val result = x.acquireFor( x =>  7 )
-	     println(result)
-	  }
-	}
diff --git a/test/files/continuations-run/t3199b.check b/test/files/continuations-run/t3199b.check
deleted file mode 100644
index b5d8bb58d9..0000000000
--- a/test/files/continuations-run/t3199b.check
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2, 3]
diff --git a/test/files/continuations-run/t3199b.scala b/test/files/continuations-run/t3199b.scala
deleted file mode 100644
index 950c584153..0000000000
--- a/test/files/continuations-run/t3199b.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object Test {
-
-  def test() = {
-    java.util.Arrays.asList(Array(1,2,3):_*)
-  }
-
-  def main(args: Array[String]) = {
-    println(test())
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t3223.check b/test/files/continuations-run/t3223.check
deleted file mode 100644
index ec635144f6..0000000000
--- a/test/files/continuations-run/t3223.check
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/test/files/continuations-run/t3223.scala b/test/files/continuations-run/t3223.scala
deleted file mode 100644
index 4e510178e6..0000000000
--- a/test/files/continuations-run/t3223.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-import scala.util.continuations._
-object Test {
-
-  def foo(x:Int) = {
-    try {
-      throw new Exception
-      shiftUnit0[Int,Int](7)
-    } catch {
-      case ex =>
-        val g = (a:Int)=>a
-        9
-    }
-  }
-
-  def main(args: Array[String]) {
-    println(reset(foo(0)))
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/t3225.check b/test/files/continuations-run/t3225.check
deleted file mode 100644
index df1a8a9ce4..0000000000
--- a/test/files/continuations-run/t3225.check
+++ /dev/null
@@ -1,12 +0,0 @@
-8
-8
-9
-9
-8
-9
-8
-8
-9
-9
-8
-9
diff --git a/test/files/continuations-run/t3225.scala b/test/files/continuations-run/t3225.scala
deleted file mode 100644
index ecfde279cf..0000000000
--- a/test/files/continuations-run/t3225.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  class Bla {
-    val x = 8
-    def y[T] = 9
-  }
-
-/*
-  def bla[A] = shift { k:(Bla=>A) => k(new Bla) }
-*/
-
-  def bla1 = shift { k:(Bla=>Bla) => k(new Bla) }
-  def bla2 = shift { k:(Bla=>Int) => k(new Bla) }
-
-  def fooA = bla2.x
-  def fooB[T] = bla2.y[T]
-
-  def testMono() = {
-    println(reset(bla1).x)
-    println(reset(bla2.x))
-    println(reset(bla2.y[Int]))
-    println(reset(bla2.y))
-    println(reset(fooA))
-    println(reset(fooB))
-    0
-  }
-
-  def blaX[A] = shift { k:(Bla=>A) => k(new Bla) }
-
-  def fooX[A] = blaX[A].x
-  def fooY[A] = blaX[A].y[A]
-
-  def testPoly() = {
-    println(reset(blaX[Bla]).x)
-    println(reset(blaX[Int].x))
-    println(reset(blaX[Int].y[Int]))
-    println(reset(blaX[Int].y))
-    println(reset(fooX[Int]))
-    println(reset(fooY[Int]))
-    0
-  }
-
-
-  // TODO: check whether this also applies to a::shift { k => ... }
-
-  def main(args: Array[String]) = {
-    testMono()
-    testPoly()
-  }
-
-}
diff --git a/test/files/continuations-run/trycatch0.check b/test/files/continuations-run/trycatch0.check
deleted file mode 100644
index 36806909d0..0000000000
--- a/test/files/continuations-run/trycatch0.check
+++ /dev/null
@@ -1,2 +0,0 @@
-10
-10
\ No newline at end of file
diff --git a/test/files/continuations-run/trycatch0.scala b/test/files/continuations-run/trycatch0.scala
deleted file mode 100644
index 74a078b5ef..0000000000
--- a/test/files/continuations-run/trycatch0.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-object Test {
-
-  def foo = try {
-    shift((k: Int=>Int) => k(7))
-  } catch {
-    case ex =>
-      9
-  }
-
-  def bar = try {
-    7
-  } catch {
-    case ex =>
-    shiftUnit0[Int,Int](9)
-  }
-
-  def main(args: Array[String]): Unit = {
-    println(reset { foo + 3 })
-    println(reset { bar + 3 })
-  }
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/trycatch1.check b/test/files/continuations-run/trycatch1.check
deleted file mode 100644
index a028d2b1e1..0000000000
--- a/test/files/continuations-run/trycatch1.check
+++ /dev/null
@@ -1,4 +0,0 @@
-12
-12
-12
-12
\ No newline at end of file
diff --git a/test/files/continuations-run/trycatch1.scala b/test/files/continuations-run/trycatch1.scala
deleted file mode 100644
index ade13794e3..0000000000
--- a/test/files/continuations-run/trycatch1.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-object Test {
-
-  def fatal: Int = throw new Exception()
-
-  def foo1 = try {
-    fatal
-    shift((k: Int=>Int) => k(7))
-  } catch {
-    case ex =>
-      9
-  }
-
-  def foo2 = try {
-    shift((k: Int=>Int) => k(7))
-    fatal
-  } catch {
-    case ex =>
-      9
-  }
-
-  def bar1 = try {
-    fatal
-    7
-  } catch {
-    case ex =>
-      shiftUnit0[Int,Int](9) // regular shift causes no-symbol doesn't have owner
-  }
-
-  def bar2 = try {
-    7
-    fatal
-  } catch {
-    case ex =>
-      shiftUnit0[Int,Int](9) // regular shift causes no-symbol doesn't have owner
-  }
-
-  def main(args: Array[String]): Unit = {
-    println(reset { foo1 + 3 })
-    println(reset { foo2 + 3 })
-    println(reset { bar1 + 3 })
-    println(reset { bar2 + 3 })
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/while0.check b/test/files/continuations-run/while0.check
deleted file mode 100644
index d58c55a31d..0000000000
--- a/test/files/continuations-run/while0.check
+++ /dev/null
@@ -1 +0,0 @@
-9000
diff --git a/test/files/continuations-run/while0.scala b/test/files/continuations-run/while0.scala
deleted file mode 100644
index 9735f9d2c3..0000000000
--- a/test/files/continuations-run/while0.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def foo(): Int @cps[Unit] = 2
-
-  def test(): Unit @cps[Unit] = {
-    var x = 0
-    while (x < 9000) { // pick number large enough to require tail-call opt
-      x += foo()
-    }
-    println(x)
-  }
-
-  def main(args: Array[String]): Any = {
-    reset(test())
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/while1.check b/test/files/continuations-run/while1.check
deleted file mode 100644
index 3d5f0b9a46..0000000000
--- a/test/files/continuations-run/while1.check
+++ /dev/null
@@ -1,11 +0,0 @@
-up
-up
-up
-up
-up
-10
-down
-down
-down
-down
-down
diff --git a/test/files/continuations-run/while1.scala b/test/files/continuations-run/while1.scala
deleted file mode 100644
index fb5dc0079a..0000000000
--- a/test/files/continuations-run/while1.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def foo(): Int @cps[Unit] = shift { k => println("up"); k(2); println("down") }
-
-  def test(): Unit @cps[Unit] = {
-    var x = 0
-    while (x < 9) {
-      x += foo()
-    }
-    println(x)
-  }
-
-  def main(args: Array[String]): Any = {
-    reset(test())
-  }
-
-}
\ No newline at end of file
diff --git a/test/files/continuations-run/while2.check b/test/files/continuations-run/while2.check
deleted file mode 100644
index 9fe515181b..0000000000
--- a/test/files/continuations-run/while2.check
+++ /dev/null
@@ -1,19 +0,0 @@
-up
-up
-up
-up
-up
-up
-up
-up
-up
-9000
-down
-down
-down
-down
-down
-down
-down
-down
-down
diff --git a/test/files/continuations-run/while2.scala b/test/files/continuations-run/while2.scala
deleted file mode 100644
index f36288929e..0000000000
--- a/test/files/continuations-run/while2.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-import scala.util.continuations._
-
-
-object Test {
-
-  def foo1(): Int @cps[Unit] = 2
-  def foo2(): Int @cps[Unit] = shift { k => println("up"); k(2); println("down") }
-
-  def test(): Unit @cps[Unit] = {
-    var x = 0
-    while (x < 9000) { // pick number large enough to require tail-call opt
-      x += (if (x % 1000 != 0) foo1() else foo2())
-    }
-    println(x)
-  }
-
-  def main(args: Array[String]): Any = {
-    reset(test())
-  }
-
-}
\ No newline at end of file
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/NestedAnnotations.java b/test/files/jvm/NestedAnnotations.java
deleted file mode 100644
index 8f2327dcce..0000000000
--- a/test/files/jvm/NestedAnnotations.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package test;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-public class NestedAnnotations {
-
-  @OuterAnno(inner=@InnerAnno(name="inner"))
-  String field;
-
-  @Target({FIELD})
-  @Retention(RUNTIME)
-  public static @interface InnerAnno {
-    String name();
-  }
-
-  @Target({FIELD})
-  @Retention(RUNTIME)
-  public static @interface OuterAnno {
-    InnerAnno inner();
-  }
-}
diff --git a/test/files/jvm/OuterEnum.java b/test/files/jvm/OuterEnum.java
deleted file mode 100644
index 75d3f34223..0000000000
--- a/test/files/jvm/OuterEnum.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package enums;
-
-public class OuterEnum {
-  public enum Foo { Bar }
-}
diff --git a/test/files/jvm/OuterTParams.java b/test/files/jvm/OuterTParams.java
deleted file mode 100644
index 1d3db49fcf..0000000000
--- a/test/files/jvm/OuterTParams.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class OuterTParams<A> {
-    class InnerClass {
-	// Cannot parse method signature: "()TA;"
-	public A method() { return null; }
-    }
-}
diff --git a/test/files/jvm/SourceAnnotation.java b/test/files/jvm/SourceAnnotation.java
deleted file mode 100644
index 047751ddfe..0000000000
--- a/test/files/jvm/SourceAnnotation.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package test;
-
-import java.lang.annotation.*;
-
-@Retention(value=RetentionPolicy.RUNTIME)
-public @interface SourceAnnotation {
-    public String value();
-    public String[] mails() default { "bill.gates@bloodsuckers.com" };
-}
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/jvm/genericNest.scala b/test/files/jvm/genericNest.scala
deleted file mode 100644
index c1b0210117..0000000000
--- a/test/files/jvm/genericNest.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-/** found in genericNest.jar, compiled from OuterTParams.java */
-import nestpkg._;
-
-// bug #695
-object ForceParse extends OuterTParams[AnyRef] {
-  // Force import of HarderToParse<A>.InnerClass,
-  // which has confusing method signature.
-  var field: InnerClass = null
-}
-
-object Test extends Application {
-  ForceParse
-}
diff --git a/test/files/jvm/genericNest/genericNest.jar.desired.sha1 b/test/files/jvm/genericNest/genericNest.jar.desired.sha1
new file mode 100644
index 0000000000..e9321262f2
--- /dev/null
+++ b/test/files/jvm/genericNest/genericNest.jar.desired.sha1
@@ -0,0 +1 @@
+b1ec8a095cec4902b3609d74d274c04365c59c04 ?genericNest.jar
diff --git a/test/files/jvm/genericNest/genericNest.scala b/test/files/jvm/genericNest/genericNest.scala
new file mode 100644
index 0000000000..c1b0210117
--- /dev/null
+++ b/test/files/jvm/genericNest/genericNest.scala
@@ -0,0 +1,13 @@
+/** found in genericNest.jar, compiled from OuterTParams.java */
+import nestpkg._;
+
+// bug #695
+object ForceParse extends OuterTParams[AnyRef] {
+  // Force import of HarderToParse<A>.InnerClass,
+  // which has confusing method signature.
+  var field: InnerClass = null
+}
+
+object Test extends Application {
+  ForceParse
+}
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/jvm/lib/annotations.jar.desired.sha1 b/test/files/jvm/lib/annotations.jar.desired.sha1
new file mode 100644
index 0000000000..2b4292d796
--- /dev/null
+++ b/test/files/jvm/lib/annotations.jar.desired.sha1
@@ -0,0 +1 @@
+02fe2ed93766323a13f22c7a7e2ecdcd84259b6c ?annotations.jar
diff --git a/test/files/jvm/lib/nest.jar.desired.sha1 b/test/files/jvm/lib/nest.jar.desired.sha1
new file mode 100644
index 0000000000..674ca79a5b
--- /dev/null
+++ b/test/files/jvm/lib/nest.jar.desired.sha1
@@ -0,0 +1 @@
+cd33e0a0ea249eb42363a2f8ba531186345ff68c ?nest.jar
diff --git a/test/files/jvm/methvsfield.java b/test/files/jvm/methvsfield.java
deleted file mode 100644
index dadc98669a..0000000000
--- a/test/files/jvm/methvsfield.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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
deleted file mode 100644
index e9795ec6a8..0000000000
--- a/test/files/jvm/methvsfield.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// bug #1062
-object Test extends Application {
-  println((new MethVsField).three)
-}
diff --git a/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1 b/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1
new file mode 100644
index 0000000000..8c01532b88
--- /dev/null
+++ b/test/files/jvm/methvsfield/methvsfield.jar.desired.sha1
@@ -0,0 +1 @@
+be8454d5e7751b063ade201c225dcedefd252775 ?methvsfield.jar
diff --git a/test/files/jvm/methvsfield/methvsfield.java b/test/files/jvm/methvsfield/methvsfield.java
new file mode 100644
index 0000000000..dadc98669a
--- /dev/null
+++ b/test/files/jvm/methvsfield/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/methvsfield.scala b/test/files/jvm/methvsfield/methvsfield.scala
new file mode 100644
index 0000000000..e9795ec6a8
--- /dev/null
+++ b/test/files/jvm/methvsfield/methvsfield.scala
@@ -0,0 +1,4 @@
+// bug #1062
+object Test extends Application {
+  println((new MethVsField).three)
+}
diff --git a/test/files/jvm/mkAnnotationsJar.sh b/test/files/jvm/mkAnnotationsJar.sh
deleted file mode 100755
index 3d69351165..0000000000
--- a/test/files/jvm/mkAnnotationsJar.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-##############################################################################
-# Author  : Nikolay Mihaylov
-##############################################################################
-
-##############################################################################
-# variables
-
-OBJDIR=./classes
-
-if [ -z "${JAVA_HOME}" ]; then
-  echo "environment variable JAVA_HOME is undefined."
-  exit
-fi
-
-JAVAC=${JAVA_HOME}/bin/javac
-JAVAC_OPTIONS="-source 1.5 -target 1.5"
-
-JAR=${JAVA_HOME}/bin/jar
-
-##############################################################################
-# commands
-
-mkdir -p ${OBJDIR}
-${JAVAC} ${JAVAC_OPTIONS} -d ${OBJDIR} SourceAnnotation.java NestedAnnotations.java
-${JAR} cf ../lib/annotations.jar -C ${OBJDIR} .
-rm -rf ${OBJDIR}
diff --git a/test/files/jvm/nest.java b/test/files/jvm/nest.java
deleted file mode 100644
index 3f6f0bebbd..0000000000
--- a/test/files/jvm/nest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index 3ab62484fa..0000000000
--- a/test/files/jvm/nest.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-//############################################################################
-// 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/nest/nest.java b/test/files/jvm/nest/nest.java
new file mode 100644
index 0000000000..3f6f0bebbd
--- /dev/null
+++ b/test/files/jvm/nest/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/nest.scala b/test/files/jvm/nest/nest.scala
new file mode 100644
index 0000000000..3ab62484fa
--- /dev/null
+++ b/test/files/jvm/nest/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.scala b/test/files/jvm/outerEnum.scala
deleted file mode 100644
index 18794b7dbe..0000000000
--- a/test/files/jvm/outerEnum.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-import enums._
-
-object Test extends Application {
-  def foo {
-    val res: OuterEnum.Foo = OuterEnum.Foo.Bar
-    println(res)
-  }
-  foo
-}
diff --git a/test/files/jvm/outerEnum/enums.jar.desired.sha1 b/test/files/jvm/outerEnum/enums.jar.desired.sha1
new file mode 100644
index 0000000000..46cd8e92cf
--- /dev/null
+++ b/test/files/jvm/outerEnum/enums.jar.desired.sha1
@@ -0,0 +1 @@
+981392dbd1f727b152cd1c908c5fce60ad9d07f7 ?enums.jar
diff --git a/test/files/jvm/outerEnum/outerEnum.scala b/test/files/jvm/outerEnum/outerEnum.scala
new file mode 100644
index 0000000000..18794b7dbe
--- /dev/null
+++ b/test/files/jvm/outerEnum/outerEnum.scala
@@ -0,0 +1,9 @@
+import enums._
+
+object Test extends Application {
+  def foo {
+    val res: OuterEnum.Foo = OuterEnum.Foo.Bar
+    println(res)
+  }
+  foo
+}
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/annotations.jar.desired.sha1 b/test/files/lib/annotations.jar.desired.sha1
deleted file mode 100644
index 2b4292d796..0000000000
--- a/test/files/lib/annotations.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-02fe2ed93766323a13f22c7a7e2ecdcd84259b6c ?annotations.jar
diff --git a/test/files/lib/enums.jar.desired.sha1 b/test/files/lib/enums.jar.desired.sha1
deleted file mode 100644
index 46cd8e92cf..0000000000
--- a/test/files/lib/enums.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-981392dbd1f727b152cd1c908c5fce60ad9d07f7 ?enums.jar
diff --git a/test/files/lib/genericNest.jar.desired.sha1 b/test/files/lib/genericNest.jar.desired.sha1
deleted file mode 100644
index e9321262f2..0000000000
--- a/test/files/lib/genericNest.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b1ec8a095cec4902b3609d74d274c04365c59c04 ?genericNest.jar
diff --git a/test/files/lib/methvsfield.jar.desired.sha1 b/test/files/lib/methvsfield.jar.desired.sha1
deleted file mode 100644
index 8c01532b88..0000000000
--- a/test/files/lib/methvsfield.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-be8454d5e7751b063ade201c225dcedefd252775 ?methvsfield.jar
diff --git a/test/files/lib/nest.jar.desired.sha1 b/test/files/lib/nest.jar.desired.sha1
deleted file mode 100644
index 674ca79a5b..0000000000
--- a/test/files/lib/nest.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd33e0a0ea249eb42363a2f8ba531186345ff68c ?nest.jar
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/bug1210.check b/test/files/neg/bug1210.check
deleted file mode 100644
index 4db920556f..0000000000
--- a/test/files/neg/bug1210.check
+++ /dev/null
@@ -1,7 +0,0 @@
-bug1210.scala:13: error: illegal cyclic reference involving type Settings
-        val v: List[selfType] = f[selfType]((x: selfType) => x.v)
-                                                              ^
-bug1210.scala:24: error: illegal cyclic reference involving type Settings
-			f[selfType](_.g)
-                                     ^
-two errors found
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/t1380/gnujaxp.jar.desired.sha1 b/test/files/pos/t1380/gnujaxp.jar.desired.sha1
deleted file mode 100644
index c155c2aaa2..0000000000
--- a/test/files/pos/t1380/gnujaxp.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee000286d00c5209d5644462c1cfea87fc8b1342 ?gnujaxp.jar
diff --git a/test/files/pos/t1380/hallo.scala b/test/files/pos/t1380/hallo.scala
deleted file mode 100644
index 27ecd9fb8b..0000000000
--- a/test/files/pos/t1380/hallo.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object hallo {
-       def main(args:Array[String]) = println("hallo")
-}
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/files/run/t2946/Parsers.scala b/test/files/run/t2946/Parsers.scala
new file mode 100644
index 0000000000..c0961034c4
--- /dev/null
+++ b/test/files/run/t2946/Parsers.scala
@@ -0,0 +1,4 @@
+class Parser {
+  def parse(t: Any): Unit = {
+  }
+}
diff --git a/test/files/run/t2946/ResponseCommon.scala b/test/files/run/t2946/ResponseCommon.scala
new file mode 100644
index 0000000000..fa9d8acccb
--- /dev/null
+++ b/test/files/run/t2946/ResponseCommon.scala
@@ -0,0 +1,14 @@
+trait ResponseCommon extends Parser {
+  private[this] var paramsParser: Parser = null
+  def withParamsParser(parser: Parser) = {paramsParser = parser; this}
+
+  class Foo {
+    println(paramsParser)
+  }
+
+  override abstract def parse(t: Any): Unit = t match {
+    case ("params", value: List[_]) => value.foreach {paramsParser.parse(_)}
+    case _ => super.parse(t)
+  }
+}
+
diff --git a/test/files/run/t2946/Test.scala b/test/files/run/t2946/Test.scala
new file mode 100644
index 0000000000..e9d9896a0e
--- /dev/null
+++ b/test/files/run/t2946/Test.scala
@@ -0,0 +1,7 @@
+class Test extends Parser with ResponseCommon
+
+object Test {
+  def main(args: Array[String]) {
+    new Test
+  }
+}
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
old mode 100644
new mode 100755
diff --git a/test/files/script/loadAndExecute/lAndE1.scala b/test/files/script/loadAndExecute/lAndE1.scala
deleted file mode 100755
index b20d1a9428..0000000000
--- a/test/files/script/loadAndExecute/lAndE1.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object Bop {
-  implicit def int2list(x: Int): List[String] = List("hello", "world")
-}
\ No newline at end of file
diff --git a/test/files/script/loadAndExecute/lAndE2.scala b/test/files/script/loadAndExecute/lAndE2.scala
deleted file mode 100755
index ea15a04d86..0000000000
--- a/test/files/script/loadAndExecute/lAndE2.scala
+++ /dev/null
@@ -1 +0,0 @@
-import Bop._
diff --git a/test/files/script/loadAndExecute/loadAndExecute.check b/test/files/script/loadAndExecute/loadAndExecute.check
deleted file mode 100644
index ccd8cd6e37..0000000000
--- a/test/files/script/loadAndExecute/loadAndExecute.check
+++ /dev/null
@@ -1 +0,0 @@
-List(hello, world)
diff --git a/test/files/script/loadAndExecute/loadAndExecute.scala b/test/files/script/loadAndExecute/loadAndExecute.scala
deleted file mode 100755
index 2a9718382b..0000000000
--- a/test/files/script/loadAndExecute/loadAndExecute.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-scala -nocompdaemon -i lAndE1.scala lAndE2.scala -e 'println(5: List[String])'
diff --git a/test/files/script/utf8.bat b/test/files/script/utf8.bat
deleted file mode 100755
index 8bc5c886f7..0000000000
--- a/test/files/script/utf8.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-::#!
-:: utf8 - <description>.
-
-@echo off
-call scala -nocompdaemon %0 %*
-goto :eof
-::!#
-
-/*Comment Комментарий*/
-Console.println("QWERTY");
-Console.println("ЙЦУКЕН");
diff --git a/test/files/script/utf8.check b/test/files/script/utf8.check
deleted file mode 100644
index 29dc0518ff..0000000000
--- a/test/files/script/utf8.check
+++ /dev/null
@@ -1,2 +0,0 @@
-QWERTY
-ЙЦУКЕН
diff --git a/test/files/script/utf8.scala b/test/files/script/utf8.scala
deleted file mode 100755
index 5366562cee..0000000000
--- a/test/files/script/utf8.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# fact - A simple Scala script that prints out the factorial of
-#        the argument specified on the command line.
-
-cygwin=false;
-case "`uname`" in
-    CYGWIN*) cygwin=true ;;
-esac
-
-SOURCE="$0";
-if $cygwin; then
-    if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ;
-then
-        format=mixed
-    else
-        format=windows
-    fi
-    SOURCE=`cygpath --$format "$SOURCE"`;
-fi
-
-export LC_CTYPE=en_US.UTF-8
-exec scala -nocompdaemon "$SOURCE" "$@"
-!#
-
-/*Comment Комментарий*/
-Console.println("QWERTY");
-Console.println("ЙЦУКЕН");
-- 
cgit v1.2.3