7 files changed, 41 insertions, 71 deletions
diff --git a/test/disabled/run/spec-matrix.check b/test/disabled/run/spec-matrix.check
deleted file mode 100644
index 72e8ffc0db..0000000000
--- a/test/disabled/run/spec-matrix.check
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/test/disabled/run/spec-matrix.scala b/test/disabled/run/spec-matrix.scala
deleted file mode 100644
index 81e3eaf212..0000000000
--- a/test/disabled/run/spec-matrix.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-/** Test matrix multiplication with specialization.
- */
-
-class Matrix[@specialized A: ClassManifest](val rows: Int, val cols: Int) {
-  private val arr: Array[Array[A]] = new Array[Array[A]](rows, cols)
-
-  def apply(i: Int, j: Int): A = {
-    if (i < 0 || i >= rows || j < 0 || j >= cols)
-      throw new NoSuchElementException("Indexes out of bounds: " + (i, j))
-
-    arr(i)(j)
-  }
-
-  def update(i: Int, j: Int, e: A) {
-    arr(i)(j) = e
-  }
-
-  def rowsIterator: Iterator[Array[A]] = new Iterator[Array[A]] {
-    var idx = 0;
-    def hasNext = idx < rows
-    def next = {
-      idx += 1
-      arr(idx - 1)
-    }
-  }
-}
-
-object Test {
-  def main(args: Array[String]) {
-    val m = randomMatrix(200, 100)
-    val n = randomMatrix(100, 200)
-
-    mult(m, n)
-    println("*")
-  }
-
-  def randomMatrix(n: Int, m: Int) = {
-    val r = new util.Random(10)
-    val x = new Matrix[Int](n, m)
-    for (i <- 0 until n; j <- 0 until m)
-      x(i, j) = r.nextInt
-    x
-  }
-
-
-  def multManifest[@specialized(Int) T](m: Matrix[T], n: Matrix[T])(implicit cm: ClassManifest[T], num: Numeric[T]) {
-    val p = new Matrix[T](m.rows, n.cols)
-    import num._
-
-    for (i <- 0 until m.rows)
-      for (j <- 0 until n.cols) {
-        var sum = num.zero
-        for (k <- 0 until n.rows)
-          sum += m(i, k) * n(k, j)
-        p(i, j) = sum
-      }
-  }
-
-  def mult(m: Matrix[Int], n: Matrix[Int]) {
-    val p = new Matrix[Int](m.rows, n.cols)
-
-    for (i <- 0 until m.rows)
-      for (j <- 0 until n.cols) {
-        var sum = 0
-        for (k <- 0 until n.rows)
-          sum += m(i, k) * n(k, j)
-        p(i, j) = sum
-      }
-  }
-}
diff --git a/test/disabled/run/stream_length.check b/test/disabled/run/stream_length.check
new file mode 100644
index 0000000000..9906de773c
--- /dev/null
+++ b/test/disabled/run/stream_length.check
@@ -0,0 +1 @@
+Length: 970299
diff --git a/test/disabled/run/stream_length.scala b/test/disabled/run/stream_length.scala
new file mode 100644
index 0000000000..68e9cad5ac
--- /dev/null
+++ b/test/disabled/run/stream_length.scala
@@ -0,0 +1,15 @@
+
+
+object Test {
+  def walk(depth: Int, bias: String): Stream[String] = {
+    if (depth == 0)
+      Stream(bias)
+    else {
+      Stream.concat(Stream.range(1, 100).map((x: Int) => walk(depth-1, bias + x)))
+    }
+  }
+
+  def main(args: Array[String]) {
+    println("Length: " + walk(3, "---").length)
+  }
+}
diff --git a/test/disabled/run/t2946/Parsers.scala b/test/disabled/run/t2946/Parsers.scala
new file mode 100644
index 0000000000..c0961034c4
--- /dev/null
+++ b/test/disabled/run/t2946/Parsers.scala
@@ -0,0 +1,4 @@
+class Parser {
+  def parse(t: Any): Unit = {
+  }
+}
diff --git a/test/disabled/run/t2946/ResponseCommon.scala b/test/disabled/run/t2946/ResponseCommon.scala
new file mode 100644
index 0000000000..fa9d8acccb
--- /dev/null
+++ b/test/disabled/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/disabled/run/t2946/Test.scala b/test/disabled/run/t2946/Test.scala
new file mode 100644
index 0000000000..e9d9896a0e
--- /dev/null
+++ b/test/disabled/run/t2946/Test.scala
@@ -0,0 +1,7 @@
+class Test extends Parser with ResponseCommon
+
+object Test {
+  def main(args: Array[String]) {
+    new Test
+  }
+}