summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-09-04 14:20:39 -0700
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-09-04 14:20:39 -0700
commit5044f1c1e863ca75c6f49462d370e48b51f3e8c7 (patch)
tree570ab5a0c251898531167112c903c4f2526b49af /test/files
parenta8c05274f738943ae58ecefda4b012b9daf5d8dc (diff)
parent20b7ae6b8839be6593d1a3ca31ac938bb3431f25 (diff)
downloadscala-5044f1c1e863ca75c6f49462d370e48b51f3e8c7.tar.gz
scala-5044f1c1e863ca75c6f49462d370e48b51f3e8c7.tar.bz2
scala-5044f1c1e863ca75c6f49462d370e48b51f3e8c7.zip
Merge pull request #2877 from som-snytt/issue/repl-stack-trunc
SI-7781 REPL stack trunc shows cause
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/repl-trim-stack-trace.scala11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/files/run/repl-trim-stack-trace.scala b/test/files/run/repl-trim-stack-trace.scala
index bbf46f2f19..0f4a43bc85 100644
--- a/test/files/run/repl-trim-stack-trace.scala
+++ b/test/files/run/repl-trim-stack-trace.scala
@@ -13,6 +13,7 @@ f: Nothing
scala> f
java.lang.Exception: Uh-oh
at .f(<console>:7)
+ ... 69 elided
scala> def f = throw new Exception("")
f: Nothing
@@ -20,6 +21,7 @@ f: Nothing
scala> f
java.lang.Exception:
at .f(<console>:7)
+ ... 69 elided
scala> def f = throw new Exception
f: Nothing
@@ -27,7 +29,16 @@ f: Nothing
scala> f
java.lang.Exception
at .f(<console>:7)
+ ... 69 elided
scala> """
+ // normalize the "elided" lines because the frame count depends on test context
+ lazy val elided = """(\s+\.{3} )\d+( elided)""".r
+ def normalize(line: String) = line match {
+ case elided(ellipsis, suffix) => s"$ellipsis???$suffix"
+ case s => s
+ }
+ override def eval() = super.eval() map normalize
+ override def expected = super.expected map normalize
}