Merge pull request #259 from scala/backport-lts-3.3-21801

Backport "Revert dubious retry in vulpix" to 3.3 LTS

Author: tgodzik

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -12,7 +12,7 @@ import java.nio.file.{Files, NoSuchFileException, Path, Paths}
 import java.nio.charset.{Charset, StandardCharsets}
 import java.text.SimpleDateFormat
 import java.util.{HashMap, Timer, TimerTask}
-import java.util.concurrent.{ExecutionException, TimeUnit, TimeoutException, Executors => JExecutors}
+import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors}
 
 import scala.collection.mutable
 import scala.io.{Codec, Source}
@@ -511,12 +511,6 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         .and("-d", targetDir.getPath)
         .withClasspath(targetDir.getPath)
 
-      def waitForJudiciously(process: Process): Int =
-        try process.waitFor()
-        catch case _: InterruptedException =>
-          try if process.waitFor(5L, TimeUnit.MINUTES) then process.exitValue() else -2
-          finally Thread.currentThread.interrupt()
-
       def compileWithJavac(fs: Array[String]) = if (fs.nonEmpty) {
         val fullArgs = Array(
           "-encoding", StandardCharsets.UTF_8.name,
@@ -525,7 +519,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         val process = Runtime.getRuntime.exec("javac" +: fullArgs)
         val output = Source.fromInputStream(process.getErrorStream).mkString
 
-        if waitForJudiciously(process) != 0 then Some(output)
+        if process.waitFor() != 0 then Some(output)
         else None
       } else None
 
@@ -704,11 +698,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
         for fut <- eventualResults do
           try fut.get()
-          catch
-          case ee: ExecutionException if ee.getCause.isInstanceOf[InterruptedException] =>
-            System.err.println("Interrupted (probably running after shutdown)")
-            ee.printStackTrace()
-          case ex: Exception =>
+          catch case ex: Exception =>
             System.err.println(ex.getMessage)
             ex.printStackTrace()