Merge pull request scala#11044 from SethTisue/fix-jdk-24

SethTisue · web-flow · commit 6f1ac0aea8f4 · 2025-04-15T19:34:03.000-07:00
Fix JDK 24+ by removing more exit calls
diff --git a/test/files/pos/t7591/Demo.scala b/test/files/pos/t7591/Demo.scala
@@ -47,7 +47,7 @@ object DemoSpec extends DemoSpec with Property {
   type ThisCommandLine = SpecCommandLine
   def creator(args: List[String]) =
     new SpecCommandLine(args) {
-      override def errorFn(msg: String) = { println("Error: " + msg) ; sys.exit(0) }
+      override def errorFn(msg: String) = { throw new Error("Error: " + msg) }
     }
 }
 
diff --git a/test/files/presentation/random/src/Random.scala b/test/files/presentation/random/src/Random.scala
@@ -63,8 +63,8 @@ object randomserver {
     }
     catch {
       case e: IOException =>
-        System.err.println("Could not listen on port: 9999.");
-        System.exit(-1)
+        System.err.println("Could not listen on port: 9999.")
+        throw e
     }
   }
 
diff --git a/test/files/run/fail-non-value-types.scala b/test/files/run/fail-non-value-types.scala
@@ -35,6 +35,6 @@ object Test {
     println(map.info)
     println(map.infoIn(cil))
     println(distinct.info)
-    if (failed) sys.exit(1)
+    assert(!failed)
   }
 }
diff --git a/test/files/run/verify-ctor.scala b/test/files/run/verify-ctor.scala
@@ -1,11 +1,12 @@
 class Foo(val str: String) {
   def this(arr: Array[Char]) = this({
-    if (arr.length == 0) sys.exit(1)
+    if (arr.length == 0) Test.quit(1)
     new String(arr)
   })
 }
 
 object Test {
+  def quit(s: Int): Nothing = ???
   def main(args: Array[String]) = {
     val t = new Foo(Array('a', 'b', 'c'))
     println(t.str)

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ object DemoSpec extends DemoSpec with Property {`
`47`	`47`	`type ThisCommandLine = SpecCommandLine`
`48`	`48`	`def creator(args: List[String]) =`
`49`	`49`	`new SpecCommandLine(args) {`
`50`		`- override def errorFn(msg: String) = { println("Error: " + msg) ; sys.exit(0) }`
	`50`	`+ override def errorFn(msg: String) = { throw new Error("Error: " + msg) }`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ object randomserver {`
`63`	`63`	`}`
`64`	`64`	`catch {`
`65`	`65`	`case e: IOException =>`
`66`		`- System.err.println("Could not listen on port: 9999.");`
`67`		`- System.exit(-1)`
	`66`	`+ System.err.println("Could not listen on port: 9999.")`
	`67`	`+ throw e`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ object Test {`
`35`	`35`	`println(map.info)`
`36`	`36`	`println(map.infoIn(cil))`
`37`	`37`	`println(distinct.info)`
`38`		`- if (failed) sys.exit(1)`
	`38`	`+ assert(!failed)`
`39`	`39`	`}`
`40`	`40`	`}`