Skip to content

Commit 93dbfb3

Browse files
Factor out fatal-warnings & double-bindings tests
1 parent 5830643 commit 93dbfb3

14 files changed

+4
-15
lines changed

compiler/test/dotty/tools/dotc/CompilationTests.scala

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class CompilationTests extends ParallelTesting {
105105
compileDir("tests/pos/i1137-1", defaultOptions and "-Yemit-tasty") +
106106
compileFile(
107107
// succeeds despite -Xfatal-warnings because of -nowarn
108-
"tests/neg-custom-args/xfatalWarnings.scala",
108+
"tests/neg-custom-args/fatal-warnings/xfatalWarnings.scala",
109109
defaultOptions.and("-nowarn", "-Xfatal-warnings")
110110
)
111111
}.checkCompile()
@@ -175,27 +175,16 @@ class CompilationTests extends ParallelTesting {
175175
compileFilesInDir("tests/neg", defaultOptions) +
176176
compileFilesInDir("tests/neg-tailcall", defaultOptions) +
177177
compileFilesInDir("tests/neg-no-optimise", defaultOptions) +
178+
compileFilesInDir("tests/neg-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")) +
179+
compileFilesInDir("tests/neg-custom-args/allow-double-bindings", allowDoubleBindings) +
178180
compileFile("tests/neg-custom-args/i3246.scala", scala2Mode) +
179-
compileFile("tests/neg-custom-args/typers.scala", allowDoubleBindings) +
180181
compileFile("tests/neg-custom-args/overrideClass.scala", scala2Mode) +
181182
compileFile("tests/neg-custom-args/autoTuplingTest.scala", defaultOptions.and("-language:noAutoTupling")) +
182183
compileFile("tests/neg-custom-args/i1050.scala", defaultOptions.and("-strict")) +
183-
compileFile("tests/neg-custom-args/i1240.scala", allowDoubleBindings) +
184-
compileFile("tests/neg-custom-args/i2002.scala", allowDoubleBindings) +
185184
compileFile("tests/neg-custom-args/nopredef.scala", defaultOptions.and("-Yno-predef")) +
186185
compileFile("tests/neg-custom-args/noimports.scala", defaultOptions.and("-Yno-imports")) +
187186
compileFile("tests/neg-custom-args/noimports2.scala", defaultOptions.and("-Yno-imports")) +
188-
compileFile("tests/neg-custom-args/overloadsOnAbstractTypes.scala", allowDoubleBindings) +
189-
compileFile("tests/neg-custom-args/xfatalWarnings.scala", defaultOptions.and("-Xfatal-warnings")) +
190-
compileFile("tests/neg-custom-args/i3561.scala", defaultOptions.and("-Xfatal-warnings")) +
191-
compileFile("tests/neg-custom-args/pureStatement.scala", defaultOptions.and("-Xfatal-warnings")) +
192-
compileFile("tests/neg-custom-args/i2333.scala", defaultOptions.and("-Xfatal-warnings")) +
193-
compileFile("tests/neg-custom-args/i3882.scala", allowDeepSubtypes) +
194-
compileFile("tests/neg-custom-args/phantom-overload.scala", allowDoubleBindings) +
195-
compileFile("tests/neg-custom-args/phantom-overload-2.scala", allowDoubleBindings) +
196-
compileFile("tests/neg-custom-args/structural.scala", defaultOptions.and("-Xfatal-warnings")) +
197-
compileFile("tests/neg-custom-args/i2673.scala", defaultOptions.and("-Xfatal-warnings")) +
198-
compileFile("tests/neg-custom-args/t3235-minimal.scala", defaultOptions.and("-Xfatal-warnings"))
187+
compileFile("tests/neg-custom-args/i3882.scala", allowDeepSubtypes)
199188
}.checkExpectedErrors()
200189

201190
// Run tests -----------------------------------------------------------------

0 commit comments

Comments
 (0)