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.]

53 files changed, 0 insertions, 687 deletions

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