summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-11-01 00:58:36 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-11-01 00:58:36 +0000
commit684d1901d90e0312fb238901bf59c24dcbdf3854 (patch)
tree6b244158ddda23b9d1c17e8917c77a393f87e2b4 /test/files
parent1754813beb02cea6733ecdbcfd34d2f0341fb945 (diff)
downloadscala-684d1901d90e0312fb238901bf59c24dcbdf3854.tar.gz
scala-684d1901d90e0312fb238901bf59c24dcbdf3854.tar.bz2
scala-684d1901d90e0312fb238901bf59c24dcbdf3854.zip
Fixed paths for 'neg' tests.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/t0699.check6
-rw-r--r--test/files/neg/t1286.check4
-rw-r--r--test/files/neg/t4584.check2
3 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/t0699.check b/test/files/neg/t0699.check
index c944da8c10..45d3e849cc 100644
--- a/test/files/neg/t0699.check
+++ b/test/files/neg/t0699.check
@@ -1,10 +1,10 @@
-B.scala:2: error: illegal inheritance from sealed trait T
+B.scala:2: error: illegal inheritance from sealed trait T: t0699/B.scala != t0699/A.scala
trait T1 extends A.T
^
-B.scala:3: error: illegal inheritance from sealed class C
+B.scala:3: error: illegal inheritance from sealed class C: t0699/B.scala != t0699/A.scala
trait T2 extends A.C
^
-B.scala:4: error: illegal inheritance from sealed class C
+B.scala:4: error: illegal inheritance from sealed class C: t0699/B.scala != t0699/A.scala
class C1 extends A.C
^
three errors found
diff --git a/test/files/neg/t1286.check b/test/files/neg/t1286.check
index 2699f0789d..c937fb9cf1 100644
--- a/test/files/neg/t1286.check
+++ b/test/files/neg/t1286.check
@@ -1,9 +1,9 @@
a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file:
- Found in files/neg/t1286/b.scala and files/neg/t1286/a.scala
+ Found in t1286/b.scala and t1286/a.scala
trait Foo {
^
b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file:
- Found in files/neg/t1286/a.scala and files/neg/t1286/b.scala
+ Found in t1286/a.scala and t1286/b.scala
object Foo extends Foo {
^
two errors found
diff --git a/test/files/neg/t4584.check b/test/files/neg/t4584.check
index 3380f02e85..060160d76a 100644
--- a/test/files/neg/t4584.check
+++ b/test/files/neg/t4584.check
@@ -1,4 +1,4 @@
t4584.scala:1: error: incomplete unicode escape
-class A { val \u2
+class A { val /u2
^
one error found