Skip to content

Commit ff8ce20

Browse files
VladimirNikVladimirNik
committed
Neg tests: remove xerror parameter from tests (compute based on // error)
1 parent 11bd355 commit ff8ce20

13 files changed

+93
-134
lines changed

‎test/dotc/tests.scala

Lines changed: 14 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -108,88 +108,22 @@ class tests extends CompilerTest {
108108

109109
@Test def new_all = compileFiles(newDir, twice)
110110

111-
@Test def neg_abstractOverride() = compileFile(negDir, "abstract-override", xerrors = 2)
112-
@Test def neg_blockescapes() = compileFile(negDir, "blockescapesNeg", xerrors = 1)
113-
@Test def neg_bounds() = compileFile(negDir, "bounds", xerrors = 2)
114-
@Test def neg_functionArity() = compileFile(negDir, "function-arity", xerrors = 7)
115-
@Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 3)
116-
@Test def neg_typedIdents() = compileDir(negDir, "typedIdents", xerrors = 2)
117-
@Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3)
118-
@Test def neg_typers() = compileFile(negDir, "typers", xerrors = 14)(allowDoubleBindings)
119-
@Test def neg_privates() = compileFile(negDir, "privates", xerrors = 2)
120-
@Test def neg_rootImports = compileFile(negDir, "rootImplicits", xerrors = 2)
121-
@Test def neg_templateParents() = compileFile(negDir, "templateParents", xerrors = 3)
122-
@Test def neg_autoTupling = compileFile(posDir, "autoTuplingTest", args = "-language:noAutoTupling" :: Nil, xerrors = 3)
123-
@Test def neg_autoTupling2 = compileFile(negDir, "autoTuplingTest", xerrors = 3)
124-
@Test def neg_companions = compileFile(negDir, "companions", xerrors = 1)
125-
@Test def namedParams = compileFile(negDir, "named-params", xerrors = 14)
126-
@Test def neg_over = compileFile(negDir, "over", xerrors = 3)
127-
@Test def neg_overrides = compileFile(negDir, "overrides", xerrors = 14)
128-
@Test def neg_overrideClass = compileFile(negDir, "overrideClass", List("-language:Scala2"), xerrors = 1)
129-
@Test def neg_i39 = compileFile(negDir, "i39", xerrors = 2)
130-
@Test def neg_i50_volatile = compileFile(negDir, "i50-volatile", xerrors = 3)
131-
@Test def neg_zoo = compileFile(negDir, "zoo", xerrors = 12)
111+
@Test def neg_all = compileFiles(negDir, verbose = true, negTest = true, compileSubDirs = false)
112+
@Test def neg_typedIdents() = compileDir(negDir, "typedIdents", negTest = true)
113+
114+
val negCustomArgs = negDir + "customArgs/"
115+
@Test def neg_typers() = compileFile(negCustomArgs, "typers", negTest = true)(allowDoubleBindings)
116+
@Test def neg_overrideClass = compileFile(negCustomArgs, "overrideClass", List("-language:Scala2"), negTest = true)
117+
@Test def neg_autoTupling = compileFile(posDir, "autoTuplingTest", args = "-language:noAutoTupling" :: Nil, negTest = true)
118+
@Test def neg_i1050 = compileFile(negCustomArgs, "i1050", List("-strict"), negTest = true)
132119

133120
val negTailcallDir = negDir + "tailcall/"
134-
@Test def neg_tailcall_t1672b = compileFile(negTailcallDir, "t1672b", xerrors = 5)
135-
@Test def neg_tailcall_t3275 = compileFile(negTailcallDir, "t3275", xerrors = 1)
136-
@Test def neg_tailcall_t6574 = compileFile(negTailcallDir, "t6574", xerrors = 2)
137-
@Test def neg_tailcall = compileFile(negTailcallDir, "tailrec", xerrors = 7)
138-
@Test def neg_tailcall2 = compileFile(negTailcallDir, "tailrec-2", xerrors = 2)
139-
@Test def neg_tailcall3 = compileFile(negTailcallDir, "tailrec-3", xerrors = 2)
140-
141-
@Test def neg_t1843_variances = compileFile(negDir, "t1843-variances", xerrors = 1)
142-
@Test def neg_t2660_ambi = compileFile(negDir, "t2660", xerrors = 2)
143-
@Test def neg_t2994 = compileFile(negDir, "t2994", xerrors = 2)
144-
@Test def neg_subtyping = compileFile(negDir, "subtyping", xerrors = 5)
145-
@Test def neg_variances = compileFile(negDir, "variances", xerrors = 2)
146-
@Test def neg_variancesConstr = compileFile(negDir, "variances-constr", xerrors = 2)
147-
@Test def neg_i871_missingReturnType = compileFile(negDir, "i871", xerrors = 2)
148-
@Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2)
149-
@Test def neg_typetest = compileFile(negDir, "typetest", xerrors = 1)
150-
@Test def neg_t1569_failedAvoid = compileFile(negDir, "t1569-failedAvoid", xerrors = 1)
151-
@Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 2)
152-
@Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 7)
153-
@Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5)
154-
@Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2)
155-
@Test def neg_hklower = compileFile(negDir, "hklower", xerrors = 4)
156-
@Test def neg_Iter2 = compileFile(negDir, "Iter2", xerrors = 2)
157-
@Test def neg_i0091_infpaths = compileFile(negDir, "i0091-infpaths", xerrors = 3)
158-
@Test def neg_i0248_inherit_refined = compileFile(negDir, "i0248-inherit-refined", xerrors = 4)
159-
@Test def neg_i0281 = compileFile(negDir, "i0281-null-primitive-conforms", xerrors = 3)
160-
@Test def neg_i324 = compileFile(negDir, "i324", xerrors = 2)
161-
@Test def neg_i583 = compileFile(negDir, "i0583-skolemize", xerrors = 2)
162-
@Test def neg_i941 = compileFile(negDir, "i941", xerrors = 3)
163-
@Test def neg_finalSealed = compileFile(negDir, "final-sealed", xerrors = 2)
164-
@Test def neg_i645 = compileFile(negDir, "amp", xerrors = 4)
165-
@Test def neg_i705 = compileFile(negDir, "i705-inner-value-class", xerrors = 7)
166-
@Test def neg_i803 = compileFile(negDir, "i803", xerrors = 2)
167-
@Test def neg_i866 = compileFile(negDir, "i866", xerrors = 2)
168-
@Test def neg_i974 = compileFile(negDir, "i974", xerrors = 2)
169-
@Test def neg_i997 = compileFile(negDir, "i997", xerrors = 15)
170-
@Test def neg_i997a = compileFile(negDir, "i997a", xerrors = 2)
171-
@Test def neg_i1050 = compileFile(negDir, "i1050", List("-strict"), xerrors = 11)
172-
@Test def neg_i1050a = compileFile(negDir, "i1050a", xerrors = 2)
173-
@Test def neg_i1050c = compileFile(negDir, "i1050c", xerrors = 8)
174-
@Test def neg_moduleSubtyping = compileFile(negDir, "moduleSubtyping", xerrors = 4)
175-
@Test def neg_escapingRefs = compileFile(negDir, "escapingRefs", xerrors = 2)
176-
@Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8)
177-
@Test def neg_partialApplications = compileFile(negDir, "partialApplications", xerrors = 3)
178-
@Test def neg_selfInheritance = compileFile(negDir, "selfInheritance", xerrors = 6)
179-
@Test def neg_selfreq = compileFile(negDir, "selfreq", xerrors = 2)
180-
@Test def neg_singletons = compileFile(negDir, "singletons", xerrors = 8)
181-
@Test def neg_shadowedImplicits = compileFile(negDir, "arrayclone-new", xerrors = 2)
182-
@Test def neg_ski = compileFile(negDir, "ski", xerrors = 12)
183-
@Test def neg_traitParamsTyper = compileFile(negDir, "traitParamsTyper", xerrors = 5)
184-
@Test def neg_traitParamsMixin = compileFile(negDir, "traitParamsMixin", xerrors = 2)
185-
@Test def neg_firstError = compileFile(negDir, "firstError", xerrors = 3)
186-
@Test def neg_implicitLowerBound = compileFile(negDir, "implicit-lower-bound", xerrors = 1)
187-
@Test def neg_validate = compileFile(negDir, "validate", xerrors = 18)
188-
@Test def neg_validateParsing = compileFile(negDir, "validate-parsing", xerrors = 7)
189-
@Test def neg_validateRefchecks = compileFile(negDir, "validate-refchecks", xerrors = 2)
190-
@Test def neg_skolemize = compileFile(negDir, "skolemize", xerrors = 2)
191-
@Test def neg_nested_bounds = compileFile(negDir, "nested_bounds", xerrors = 1)
192-
@Test def neg_valueClasses = compileFile(negDir, "valueClasses", xerrors = 2)
121+
@Test def neg_tailcall_t1672b = compileFile(negTailcallDir, "t1672b", negTest = true)
122+
@Test def neg_tailcall_t3275 = compileFile(negTailcallDir, "t3275", negTest = true)
123+
@Test def neg_tailcall_t6574 = compileFile(negTailcallDir, "t6574", negTest = true)
124+
@Test def neg_tailcall = compileFile(negTailcallDir, "tailrec", negTest = true)
125+
@Test def neg_tailcall2 = compileFile(negTailcallDir, "tailrec-2", negTest = true)
126+
@Test def neg_tailcall3 = compileFile(negTailcallDir, "tailrec-3", negTest = true)
193127

194128
@Test def run_all = runFiles(runDir)
195129

0 commit comments

Comments
 (0)