diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-11-01 00:58:36 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-11-01 00:58:36 +0000 |
| commit | 684d1901d90e0312fb238901bf59c24dcbdf3854 (patch) | |
| tree | 6b244158ddda23b9d1c17e8917c77a393f87e2b4 | |
| parent | 1754813beb02cea6733ecdbcfd34d2f0341fb945 (diff) | |
| download | scala-684d1901d90e0312fb238901bf59c24dcbdf3854.tar.gz scala-684d1901d90e0312fb238901bf59c24dcbdf3854.tar.bz2 scala-684d1901d90e0312fb238901bf59c24dcbdf3854.zip | |
Fixed paths for 'neg' tests.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 1 | ||||
| -rw-r--r-- | test/files/neg/t0699.check | 6 | ||||
| -rw-r--r-- | test/files/neg/t1286.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t4584.check | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 89eb6f2e91..976fcc8f7c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1277,7 +1277,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { if (context.unit.source.file == psym.sourceFile || isValueClass(context.owner)) psym addChild context.owner else - error(parent.pos, "illegal inheritance from sealed "+psym+": " + context.unit.source.file + " != " + psym.sourceFile) + error(parent.pos, "illegal inheritance from sealed "+psym+": " + context.unit.source.file.canonicalPath + " != " + psym.sourceFile.canonicalPath) } if (!(selfType <:< parent.tpe.typeOfThis) && !phase.erasedTypes && diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index a8900e115d..45902229eb 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -578,6 +578,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor val dir = file.getParentFile // diff is contents of logFile + fileManager.mapFile(logFile, replaceSlashes(dir, _)) diffCheck(compareOutput(dir, logFile)) }) 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 |