diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2011-11-23 14:14:34 -0500 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-11-23 14:14:34 -0500 |
commit | 26aee7eb070ae35984be1d0c3d3b02d4909a6e26 (patch) | |
tree | 2448b2ee277b4a3bfd1df64e5b3e7eb02138ac32 /test/files/run | |
parent | b7b81ca286b1f426cd19befd50fbc513bb82282f (diff) | |
download | scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.gz scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.tar.bz2 scala-26aee7eb070ae35984be1d0c3d3b02d4909a6e26.zip |
Added *.log and build/ to gitignore so partest/...
Added *.log and build/ to gitignore so partest/ant artifacts don't show
up in our commit messages. Also fixed whitespace issues arising from the
filter-branch history rewrite for git move.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/constrained-types.check | 4 | ||||
-rw-r--r-- | test/files/run/t4532.check | 6 | ||||
-rw-r--r-- | test/files/run/t4671.check | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check index ac8817cb08..963dd4a059 100644 --- a/test/files/run/constrained-types.check +++ b/test/files/run/constrained-types.check @@ -14,7 +14,7 @@ scala> class A { val x = "hello" val y: Int @Annot(x) = 10 override def toString = "an A" -} +} defined class A scala> @@ -22,7 +22,7 @@ scala> scala> val a = new A a: A = an A -scala> val y = a.y // should rewrite "this.x" to "a.x" +scala> val y = a.y // should rewrite "this.x" to "a.x" y: Int @Annot(a.x) = 10 scala> var a2 = new A diff --git a/test/files/run/t4532.check b/test/files/run/t4532.check index 47a9809248..018bbf2fa3 100644 --- a/test/files/run/t4532.check +++ b/test/files/run/t4532.check @@ -1,7 +1,7 @@ Type in expressions to have them evaluated. Type :help for more information. -scala> +scala> scala> object Bippy { class Dingus ; object Bop } defined module Bippy @@ -10,6 +10,6 @@ scala> :javap Bippy.Dingus Compiled from "<console>"public class Bippy$Dingus extends java.lang.Object implements scala.ScalaObject{ public Bippy$Dingus();} scala> :javap Bippy.Bop Compiled from "<console>"public final class Bippy$Bop$ extends java.lang.Object implements scala.ScalaObject{ public static final Bippy$Bop$ MODULE$; public static {}; public Bippy$Bop$();} -scala> +scala> -scala> +scala> diff --git a/test/files/run/t4671.check b/test/files/run/t4671.check index 4699818cd4..797c0d8905 100644 --- a/test/files/run/t4671.check +++ b/test/files/run/t4671.check @@ -10,7 +10,7 @@ s: scala.io.BufferedSource = non-empty iterator scala> println(s.getLines.mkString("\n")) import scala.tools.partest.ReplTest -object Test extends ReplTest { +object Test extends ReplTest { // My god...it's full of quines def code = """ object o { val file = sys.props("partest.cwd") + "/t4671.scala" } @@ -30,7 +30,7 @@ s: scala.io.BufferedSource = non-empty iterator scala> println(s.mkString("")) import scala.tools.partest.ReplTest -object Test extends ReplTest { +object Test extends ReplTest { // My god...it's full of quines def code = """ object o { val file = sys.props("partest.cwd") + "/t4671.scala" } |