Merge pull request #10059 from scala/revert-10056-topic/partest-relea…

…se-8 Revert "Partest uses -release 8"
scala · Jun 24, 2022 · 69ac276 · 69ac276
2 parents 6582378 + 443262f
commit 69ac276
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala
@@ -453,15 +453,10 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) {
   }
 
   // all sources in a round may contribute flags via // scalac: -flags
-  // if a javaVersion isn't specified, require the minimum viable using -release 8 to avoid gotcha in CI.
   def flagsForCompilation(sources: List[File]): List[String] = {
-    import scala.util.Properties.isJavaAtLeast
-    var perFile = toolArgsFor(sources)("scalac")
-    if (parentFile.getParentFile.getName == "macro-annot")
-      perFile ::= "-Ymacro-annotations"
-    if (isJavaAtLeast(9) && !perFile.exists(_.startsWith("-release")) && toolArgsFor(sources)("javaVersion", split = false).isEmpty)
-      perFile :::= List("-release", "8")
-    perFile
+    val perFile = toolArgsFor(sources)("scalac")
+    if (parentFile.getParentFile.getName == "macro-annot") "-Ymacro-annotations" :: perFile
+    else perFile
   }
 
   // inspect sources for tool args

diff --git a/test/files/neg/choices.check b/test/files/neg/choices.check
@@ -1,10 +1,3 @@
-#partest java9+
-error: Usage: -Yresolve-term-conflict:<strategy> where <strategy> choices are package, object, error (default: error).
-error: bad option: '-Yresolve-term-conflict'
-error: bad options: -release 8 -Yresolve-term-conflict
-error: flags file may only contain compiler options, found: -Yresolve-term-conflict
-4 errors
-#partest java8
 error: Usage: -Yresolve-term-conflict:<strategy> where <strategy> choices are package, object, error (default: error).
 error: bad option: '-Yresolve-term-conflict'
 error: bad options: -Yresolve-term-conflict

diff --git a/test/files/neg/partestInvalidFlag.check b/test/files/neg/partestInvalidFlag.check
@@ -1,9 +1,3 @@
-#partest java9+
-error: bad option: '-badCompilerFlag'
-error: bad options: -release 8 -badCompilerFlag notAFlag -opt:badChoice
-error: flags file may only contain compiler options, found: -badCompilerFlag notAFlag -opt:badChoice
-3 errors
-#partest java8
 error: bad option: '-badCompilerFlag'
 error: bad options: -badCompilerFlag notAFlag -opt:badChoice
 error: flags file may only contain compiler options, found: -badCompilerFlag notAFlag -opt:badChoice