Skip to content

Commit 827980f

Browse files
committed
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
1 parent 54eaf64 commit 827980f

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

test/dotc/tests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class tests extends CompilerTest {
105105

106106
@Test def neg_abstractOverride() = compileFile(negDir, "abstract-override", xerrors = 2)
107107
@Test def neg_blockescapes() = compileFile(negDir, "blockescapesNeg", xerrors = 1)
108-
@Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 3)
108+
@Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 2)
109109
@Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 3)
110110
@Test def neg_typedIdents() = compileDir(negDir, "typedIdents", xerrors = 2)
111111
@Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3)
@@ -145,7 +145,7 @@ class tests extends CompilerTest {
145145
@Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 9)
146146
@Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5)
147147
@Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2)
148-
@Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 3)
148+
@Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 4)
149149
@Test def neg_Iter2 = compileFile(negDir, "Iter2", xerrors = 2)
150150
@Test def neg_i0091_infpaths = compileFile(negDir, "i0091-infpaths", xerrors = 3)
151151
@Test def neg_i0248_inherit_refined = compileFile(negDir, "i0248-inherit-refined", xerrors = 4)

tests/neg/bounds.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
object Test {
2-
class C[B >: String <: Int](x: B)
32
def g[B >: String <: Int](x: B): Int = x
43
def main(args: Array[String]): Unit = {
54
g("foo")
6-
new C("bar")
75
}
86
def baz[X >: Y, Y <: String](x: X, y: Y) = (x, y)
97

tests/neg/hklower.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class Test {
1+
class Test { // error conflicting bounds
22

33
type T[X] // OK
44
type U[X] = T[X] // OK

0 commit comments

Comments
 (0)