diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-02-01 00:17:07 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-02-09 09:43:07 +0100 |
| commit | 1441622f094e6b149fb5e166fcc51c299f116913 (patch) | |
| tree | 5c48ae0eb9ff0bd74e3353d7faa5287d1a591ba9 | |
| parent | defba2af7c3b49231962a6f882173bcaff914fcc (diff) | |
| download | dotty-1441622f094e6b149fb5e166fcc51c299f116913.tar.gz dotty-1441622f094e6b149fb5e166fcc51c299f116913.tar.bz2 dotty-1441622f094e6b149fb5e166fcc51c299f116913.zip | |
Drop lines from test
The lines in question now cause an error ("cannot be instantiated...")
which masks the real tests at phase PostTyper.
Also adapt bugcount of hklower test
| -rw-r--r-- | test/dotc/tests.scala | 4 | ||||
| -rw-r--r-- | tests/neg/bounds.scala | 2 | ||||
| -rw-r--r-- | tests/neg/hklower.scala | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 47ac00c6f..8c61f56b7 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -110,7 +110,7 @@ class tests extends CompilerTest { @Test def neg_abstractOverride() = compileFile(negDir, "abstract-override", xerrors = 2) @Test def neg_blockescapes() = compileFile(negDir, "blockescapesNeg", xerrors = 1) - @Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 3) + @Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 2) @Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 3) @Test def neg_typedIdents() = compileDir(negDir, "typedIdents", xerrors = 2) @Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3) @@ -150,7 +150,7 @@ class tests extends CompilerTest { @Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 9) @Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5) @Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2) - @Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 3) + @Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 4) @Test def neg_Iter2 = compileFile(negDir, "Iter2", xerrors = 2) @Test def neg_i0091_infpaths = compileFile(negDir, "i0091-infpaths", xerrors = 3) @Test def neg_i0248_inherit_refined = compileFile(negDir, "i0248-inherit-refined", xerrors = 4) diff --git a/tests/neg/bounds.scala b/tests/neg/bounds.scala index 55eec6941..cd6b8d05c 100644 --- a/tests/neg/bounds.scala +++ b/tests/neg/bounds.scala @@ -1,9 +1,7 @@ object Test { - class C[B >: String <: Int](x: B) def g[B >: String <: Int](x: B): Int = x def main(args: Array[String]): Unit = { g("foo") - new C("bar") } def baz[X >: Y, Y <: String](x: X, y: Y) = (x, y) diff --git a/tests/neg/hklower.scala b/tests/neg/hklower.scala index e29a1545e..5c1ba27ba 100644 --- a/tests/neg/hklower.scala +++ b/tests/neg/hklower.scala @@ -1,4 +1,4 @@ -class Test { +class Test { // error conflicting bounds type T[X] // OK type U[X] = T[X] // OK |