diff options
author | Paul Phillips <paulp@improving.org> | 2010-05-06 16:37:13 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-05-06 16:37:13 +0000 |
commit | c55b106f503d5e712e69823cfeb1cab2460221eb (patch) | |
tree | a1af091d9a2eeb16ee4747930511db4996c47140 /test/files/run | |
parent | cb35c38f14f6a53c38966bde8e64dcfa9af17918 (diff) | |
download | scala-c55b106f503d5e712e69823cfeb1cab2460221eb.tar.gz scala-c55b106f503d5e712e69823cfeb1cab2460221eb.tar.bz2 scala-c55b106f503d5e712e69823cfeb1cab2460221eb.zip |
Rolled partest back to r21328.
changes necessary to plug it back in while preserving everything which
has happened since then in tests and such, but we should be the lookout
for overreversion. Review by phaller (but as a formality, I don't think
it requires direct review.)
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/numbereq.scala | 2 | ||||
-rw-r--r-- | test/files/run/programmatic-main.check | 2 | ||||
-rw-r--r-- | test/files/run/stream_length.scala | 15 | ||||
-rw-r--r-- | test/files/run/t2946/Parsers.scala | 4 | ||||
-rw-r--r-- | test/files/run/t2946/ResponseCommon.scala | 14 | ||||
-rw-r--r-- | test/files/run/t2946/Test.scala | 7 |
6 files changed, 1 insertions, 43 deletions
diff --git a/test/files/run/numbereq.scala b/test/files/run/numbereq.scala index 52f32cc52a..b07c83dc3e 100644 --- a/test/files/run/numbereq.scala +++ b/test/files/run/numbereq.scala @@ -33,7 +33,7 @@ object Test { val sets = setneg1 ++ setneg2 ++ List(zero) ++ setpos1 ++ setpos2 for (set <- sets ; x <- set ; y <- set) { - println("'%s' == '%s' (%s == %s) (%s == %s)".format(x, y, x.hashCode, y.hashCode, x.##, y.##)) + // println("'%s' == '%s' (%s == %s) (%s == %s)".format(x, y, x.hashCode, y.hashCode, x.##, y.##)) assert(x == y, "%s/%s != %s/%s".format(x, x.getClass, y, y.getClass)) assert(x.## == y.##, "%s != %s".format(x.getClass, y.getClass)) } diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 3429195265..e6c83a6f48 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -5,9 +5,7 @@ typer superaccessors pickler refchecks -selectiveanf liftcode -selectivecps uncurry tailcalls specialize diff --git a/test/files/run/stream_length.scala b/test/files/run/stream_length.scala deleted file mode 100644 index 68e9cad5ac..0000000000 --- a/test/files/run/stream_length.scala +++ /dev/null @@ -1,15 +0,0 @@ - - -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/files/run/t2946/Parsers.scala b/test/files/run/t2946/Parsers.scala deleted file mode 100644 index c0961034c4..0000000000 --- a/test/files/run/t2946/Parsers.scala +++ /dev/null @@ -1,4 +0,0 @@ -class Parser { - def parse(t: Any): Unit = { - } -} diff --git a/test/files/run/t2946/ResponseCommon.scala b/test/files/run/t2946/ResponseCommon.scala deleted file mode 100644 index fa9d8acccb..0000000000 --- a/test/files/run/t2946/ResponseCommon.scala +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index e9d9896a0e..0000000000 --- a/test/files/run/t2946/Test.scala +++ /dev/null @@ -1,7 +0,0 @@ -class Test extends Parser with ResponseCommon - -object Test { - def main(args: Array[String]) { - new Test - } -} |