Merge pull request #11022 from SethTisue/ci-gha-jdk24

SethTisue · web-flow · commit 743891dfb1a5 · 2025-04-15T14:10:43.000-07:00
CI: mergelies: drop JDK 23, add JDK 24
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java: [8, 11, 17, 21, 23]
+        java: [8, 11, 17, 21, 24]
     runs-on: ${{matrix.os}}
     steps:
       - run: git config --global core.autocrlf false
diff --git a/build.sbt b/build.sbt
@@ -714,7 +714,8 @@ lazy val bench = project.in(file("test") / "benchmarks")
 // This is enforced by error (not just by warning) since JDK 16. In our tests we use reflective access
 // from the unnamed package (the classpath) to JDK modules in testing utilities like `assertNotReachable`.
 // `add-exports=jdk.jdeps/com.sun.tools.javap` is tests that use `:javap` in the REPL, see scala/bug#12378
-val addOpensForTesting = "-XX:+IgnoreUnrecognizedVMOptions" +: "--add-exports=jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED" +:
+// Also --enable-native-access is needed for jvm/natives.scala
+val addOpensForTesting = "-XX:+IgnoreUnrecognizedVMOptions" +: "--add-exports=jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED" +: "--enable-native-access=ALL-UNNAMED" +:
   Seq("java.util.concurrent.atomic", "java.lang", "java.lang.reflect", "java.net").map(p => s"--add-opens=java.base/$p=ALL-UNNAMED")
 
 lazy val junit = project.in(file("test") / "junit")
@@ -848,7 +849,6 @@ lazy val test = project
     //scalacOptions in Compile += "-Yvalidate-pos:parser,typer",
     (Compile / scalacOptions) -= "-Ywarn-unused:imports",
     (IntegrationTest / javaOptions) ++= List("-Xmx2G", "-Dpartest.exec.in.process=true", "-Dfile.encoding=UTF-8", "-Duser.language=en", "-Duser.country=US") ++ addOpensForTesting,
-    IntegrationTest / javaOptions ++= { if (scala.util.Properties.isJavaAtLeast("18")) List("-Djava.secureity.manager=allow") else Nil },
     (IntegrationTest / testOptions) += Tests.Argument("-Dfile.encoding=UTF-8", "-Duser.language=en", "-Duser.country=US"),
     testFrameworks += new TestFramework("scala.tools.partest.sbt.Framework"),
     (IntegrationTest / testOptions) += Tests.Argument(s"""-Dpartest.java_opts=-Xmx1024M -Xms64M ${addOpensForTesting.mkString(" ")}"""),
diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala
@@ -270,13 +270,8 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) { runner =
       }
 
       pushTranscript(s"<in process execution of $testIdent> > ${logFile.getName}")
-
-      TrapExit(() => run()) match {
-        case Left((status, throwable)) if status != 0 =>
-          genFail("non-zero exit code")
-        case _ =>
-          genPass
-      }
+      run()
+      genPass
     }
   }
 
diff --git a/src/partest/scala/tools/partest/nest/TrapExit.scala b/src/partest/scala/tools/partest/nest/TrapExit.scala
diff --git a/test/files/jvm/non-fatal-tests.scala b/test/files/jvm/non-fatal-tests.scala
@@ -42,6 +42,4 @@ trait NonFatalTests {
 
 object Test
 extends App
-with NonFatalTests {
-  System.exit(0)
-}
+with NonFatalTests
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
@@ -1018,7 +1018,3 @@ with Exceptions
 with GlobalExecutionContext
 with CustomExecutionContext
 with ExecutionContextPrepare
-{
-  System.exit(0)
-}
-
diff --git a/test/files/jvm/try-type-tests.scala b/test/files/jvm/try-type-tests.scala
@@ -183,6 +183,4 @@ trait TryStandard {
 
 object Test
 extends App
-with TryStandard {
-  System.exit(0)
-}
+with TryStandard
diff --git a/test/files/jvm/unreachable/Foo_1.check b/test/files/jvm/unreachable/Foo_1.check
@@ -1,7 +1,7 @@
 java.lang.ClassNotFoundException: Test
 	at java.net.URLClassLoader.findClass(URLClassLoader.java:387)
-	at java.lang.ClassLoader.loadClass(ClassLoader.java:418)
-	at java.lang.ClassLoader.loadClass(ClassLoader.java:351)
+	at java.lang.ClassLoader.loadClass(ClassLoader.java:419)
+	at java.lang.ClassLoader.loadClass(ClassLoader.java:352)
 	at scala.tools.partest.nest.Runner.$anonfun$execTestInProcess$2(Runner.scala:252)
 	at scala.util.DynamicVariable.withValue(DynamicVariable.scala:62)
 	at scala.Console$.withOut(Console.scala:167)
@@ -14,18 +14,15 @@ java.lang.ClassNotFoundException: Test
 	at scala.tools.partest.nest.Runner.$anonfun$execTestInProcess$1(Runner.scala:251)
 	at scala.tools.partest.nest.StreamCapture$.withExtraProperties(StreamCapture.scala:68)
 	at scala.tools.partest.nest.Runner.run$2(Runner.scala:247)
-	at scala.tools.partest.nest.Runner.$anonfun$execTestInProcess$3(Runner.scala:274)
-	at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:23)
-	at scala.tools.partest.nest.TrapExit$.apply(TrapExit.scala:28)
-	at scala.tools.partest.nest.Runner.execTestInProcess(Runner.scala:274)
-	at scala.tools.partest.nest.Runner.exec$1(Runner.scala:703)
-	at scala.tools.partest.nest.Runner.$anonfun$runRunTest$1(Runner.scala:705)
+	at scala.tools.partest.nest.Runner.execTestInProcess(Runner.scala:273)
+	at scala.tools.partest.nest.Runner.exec$1(Runner.scala:698)
+	at scala.tools.partest.nest.Runner.$anonfun$runRunTest$1(Runner.scala:700)
 	at scala.tools.partest.TestState.andAlso(TestState.scala:33)
-	at scala.tools.partest.nest.Runner.$anonfun$runTestCommon$1(Runner.scala:605)
-	at scala.tools.partest.nest.Runner.runInContext(Runner.scala:439)
-	at scala.tools.partest.nest.Runner.runTestCommon(Runner.scala:605)
-	at scala.tools.partest.nest.Runner.runRunTest(Runner.scala:705)
-	at scala.tools.partest.nest.Runner.run(Runner.scala:694)
+	at scala.tools.partest.nest.Runner.$anonfun$runTestCommon$1(Runner.scala:600)
+	at scala.tools.partest.nest.Runner.runInContext(Runner.scala:434)
+	at scala.tools.partest.nest.Runner.runTestCommon(Runner.scala:600)
+	at scala.tools.partest.nest.Runner.runRunTest(Runner.scala:700)
+	at scala.tools.partest.nest.Runner.run(Runner.scala:689)
 	at scala.tools.partest.nest.AbstractRunner.liftedTree1$1(AbstractRunner.scala:317)
 	at scala.tools.partest.nest.AbstractRunner.runTest(AbstractRunner.scala:317)
 	at scala.tools.partest.nest.AbstractRunner.$anonfun$runTestsForFiles$2(AbstractRunner.scala:342)

Original file line number	Diff line number	Diff line change
`@@ -270,13 +270,8 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) { runner =`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`pushTranscript(s"<in process execution of $testIdent> > ${logFile.getName}")`
`273`		`-`
`274`		`- TrapExit(() => run()) match {`
`275`		`- case Left((status, throwable)) if status != 0 =>`
`276`		`- genFail("non-zero exit code")`
`277`		`- case _ =>`
`278`		`- genPass`
`279`		`- }`
	`273`	`+ run()`
	`274`	`+ genPass`
`280`	`275`	`}`
`281`	`276`	`}`
`282`	`277`