Merge commit '743891dfb1' into merge-2.12-to-2.13-20250415

SethTisue · SethTisue · commit 2b8f4e142049 · 2025-04-15T18:18:18.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,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
@@ -845,7 +845,8 @@ lazy val testkit = configureAsSubproject(project)
 // 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")
@@ -1091,7 +1092,6 @@ lazy val test = project
     IntegrationTest / fork := true,
     Compile / scalacOptions += "-Yvalidate-pos:parser,typer",
     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.security.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
@@ -262,16 +262,8 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) {
       }
 
       pushTranscript(s"<in process execution of $testIdent> > ${logFile.getName}")
-
-      @nowarn("cat=deprecation")  // JDK 17 deprecates SecurityManager, so TrapExit is deprecated too
-      val trapExit = TrapExit
-
-      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-b.scala b/test/files/jvm/scala-concurrent-tck-b.scala
@@ -111,8 +111,6 @@ class ReportingExecutionContext extends TestBase {
 
 object Test extends App {
   new ReportingExecutionContext
-
-  System.exit(0)
 }
 
 package scala.concurrent {
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
@@ -1058,6 +1058,4 @@ extends App {
   new GlobalExecutionContext
   new CustomExecutionContext
   new ExecutionContextPrepare
-
-  System.exit(0)
 }
diff --git a/test/files/presentation/random/src/Random.scala b/test/files/presentation/random/src/Random.scala
@@ -64,7 +64,6 @@ object randomserver {
     catch {
       case e: IOException =>
         System.err.println("Could not listen on port: 9999.");
-        System.exit(-1)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -262,16 +262,8 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) {`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`pushTranscript(s"<in process execution of $testIdent> > ${logFile.getName}")`
`265`		`-`
`266`		`- @nowarn("cat=deprecation") // JDK 17 deprecates SecurityManager, so TrapExit is deprecated too`
`267`		`- val trapExit = TrapExit`
`268`		`-`
`269`		`- trapExit(() => run()) match {`
`270`		`- case Left((status, throwable)) if status != 0 =>`
`271`		`- genFail("non-zero exit code")`
`272`		`- case _ =>`
`273`		`- genPass()`
`274`		`- }`
	`265`	`+ run()`
	`266`	`+ genPass`
`275`	`267`	`}`
`276`	`268`	`}`
`277`	`269`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,6 @@ class ReportingExecutionContext extends TestBase {`
`111`	`111`
`112`	`112`	`object Test extends App {`
`113`	`113`	`new ReportingExecutionContext`
`114`		`-`
`115`		`- System.exit(0)`
`116`	`114`	`}`
`117`	`115`
`118`	`116`	`package scala.concurrent {`
Original file line number	Diff line number	Diff line change
`@@ -1058,6 +1058,4 @@ extends App {`
`1058`	`1058`	`new GlobalExecutionContext`
`1059`	`1059`	`new CustomExecutionContext`
`1060`	`1060`	`new ExecutionContextPrepare`
`1061`		`-`
`1062`		`- System.exit(0)`
`1063`	`1061`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ object randomserver {`
`64`	`64`	`catch {`
`65`	`65`	`case e: IOException =>`
`66`	`66`	`System.err.println("Could not listen on port: 9999.");`
`67`		`- System.exit(-1)`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`