Move to comment-based command line arg tests

adampauls · dwijnand · commit ee168c62fb7d · 2022-11-24T10:36:12.000Z
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -68,8 +68,6 @@ class CompilationTests {
       compileFile("tests/pos-custom-args/i10383.scala", defaultOptions.and("-source", "future", "-deprecation", "-Xfatal-warnings")),
       compileFile("tests/pos-custom-args/i13044.scala", defaultOptions.and("-Xmax-inlines:33")),
       compileFile("tests/pos-custom-args/jdk-8-app.scala", defaultOptions.and("-release:8")),
-      compileFile("tests/pos-custom-args/single-additional-import.scala", defaultOptions.and("-Yimports:scala,java.lang,scala.annotation")),
-      compileFile("tests/pos-custom-args/multiple-additional-imports.scala", defaultOptions.and("-Yimports:scala,java.lang,scala.Predef,scala.annotation,scala.util.matching")),
     ).checkCompile()
   }
 
@@ -153,11 +151,6 @@ class CompilationTests {
       compileFile("tests/neg-custom-args/ovlazy.scala", scala2CompatMode.and("-Xfatal-warnings")),
       compileFile("tests/neg-custom-args/newline-braces.scala", scala2CompatMode.and("-Xfatal-warnings")),
       compileFile("tests/neg-custom-args/autoTuplingTest.scala", defaultOptions.andLanguageFeature("noAutoTupling")),
-      compileFile("tests/neg-custom-args/nopredef.scala", defaultOptions.and("-Yno-predef")),
-      compileFile("tests/neg-custom-args/noimports.scala", defaultOptions.and("-Yno-imports")),
-      compileFile("tests/neg-custom-args/noimports2.scala", defaultOptions.and("-Yno-imports")),
-      compileFile("tests/neg-custom-args/noimports-additional.scala", defaultOptions.and("-Yimports:scala.annotation,scala.util.matching")),
-      compileFile("tests/neg-custom-args/nopredef-additional.scala", defaultOptions.and("-Yimports:java.lang,scala.annotation,scala.util.matching")),
       compileFile("tests/neg-custom-args/i1650.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/i3882.scala", allowDeepSubtypes),
       compileFile("tests/neg-custom-args/i4372.scala", allowDeepSubtypes),
diff --git a/tests/neg-custom-args/nopredef.scala b/tests/neg-custom-args/nopredef.scala
diff --git a/tests/neg/noimports-additional.scala b/tests/neg/noimports-additional.scala
@@ -1,4 +1,4 @@
-
+// scalac: -Yno-imports -Yimports:scala.annotation,scala.util.matching
 class annotation extends Annotation
 val s: String = "str" // error
 val regex: Regex = new Regex("str")
diff --git a/tests/neg/noimports.scala b/tests/neg/noimports.scala
@@ -1,3 +1,4 @@
+// scalac: -Yno-imports
 object Test {
   val t: Int = 1 // error: not found Int
 }
diff --git a/tests/neg/noimports2.scala b/tests/neg/noimports2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yno-imports
 object Test {
   assert("asdf" == "asdf") // error: not found assert
 }
diff --git a/tests/neg/nopredef-additional.scala b/tests/neg/nopredef-additional.scala
@@ -1,3 +1,4 @@
+// scalac: -Yno-predef -Yimports:java.lang,scala.annotation,scala.util.matching
 class annotation extends Annotation
 val s: String = "str"
 val regex: Regex = s.r // error
diff --git a/tests/neg/nopredef.scala b/tests/neg/nopredef.scala
@@ -1,5 +1,5 @@
+// scalac: -Yno-predef
 import Predef.{assert as _}
-
 object Test {
   assert("asdf" == "asdf") // error: not found assert
 }
diff --git a/tests/pos-custom-args/multiple-additional-imports.scala b/tests/pos-custom-args/multiple-additional-imports.scala
diff --git a/tests/pos-custom-args/single-additional-import.scala b/tests/pos-custom-args/single-additional-import.scala
diff --git a/tests/pos/multiple-additional-imports.scala b/tests/pos/multiple-additional-imports.scala
@@ -0,0 +1,5 @@
+// scalac: -Yimports:scala,java.lang,scala.Predef,scala.annotation,scala.util.matching
+
+class annotation extends Annotation
+val s: String = "str"
+val regex: Regex = s.r
diff --git a/tests/pos/single-additional-import.scala b/tests/pos/single-additional-import.scala
@@ -0,0 +1,2 @@
+// scalac: -Yimports:scala.annotation
+class annotation extends Annotation

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// scalac: -Yno-imports`
`1`	`2`	`object Test {`
`2`	`3`	`val t: Int = 1 // error: not found Int`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
	`1`	`+// scalac: -Yno-predef`
`1`	`2`	`import Predef.{assert as _}`
`2`		`-`
`3`	`3`	`object Test {`
`4`	`4`	`assert("asdf" == "asdf") // error: not found assert`
`5`	`5`	`}`