Assert exitCode in execCmd & fix CoursierScalaTests setup call

Author: dwijnand

compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala

@@ -148,11 +148,12 @@ class CoursierScalaTests:
 
 object CoursierScalaTests:
 
-  def execCmd(command: String, options: String*): (Int, List[String]) =
+  def execCmd(command: String, options: String*): List[String] =
     val cmd = (command :: options.toList).toSeq.mkString(" ")
     val out = new ListBuffer[String]
-    val code = cmd.!(ProcessLogger(out += _, out += _))
-    (code, out.toList)
+    val exit = cmd.!(ProcessLogger(out += _, out += _))
+    assertEquals(s"running $cmd returned exit code $exit", 0, exit)
+    out.toList
 
   def csScalaCmd(options: String*): List[String] =
     csCmd("dotty.tools.MainGenericRunner", options*)
@@ -166,16 +167,10 @@ object CoursierScalaTests:
       case Nil => args
       case _ => "--" +: args
     val newJOpts = jOpts.map(s => s"--java-opt ${s.stripPrefix("-J")}").mkString(" ")
-    execCmd("./cs", (s"""launch "org.scala-lang:scala3-compiler_3:${sys.env("DOTTY_BOOTSTRAPPED_VERSION")}" $newJOpts --main-class "$entry" --property "scala.usejavacp=true"""" +: newOptions)*)._2
+    execCmd("./cs", (s"""launch "org.scala-lang:scala3-compiler_3:${sys.env("DOTTY_BOOTSTRAPPED_VERSION")}" $newJOpts --main-class "$entry" --property "scala.usejavacp=true"""" +: newOptions)*)
 
   /** Get coursier script */
   @BeforeClass def setup(): Unit =
-    val ver = execCmd("uname")._2.head.replace('L', 'l').replace('D', 'd')
+    val ver = execCmd("uname").head.replace('L', 'l').replace('D', 'd')
+    Seq("curl", s"-fLo cs https://git.io/coursier-cli-$ver") #&& execCmd("chmod", "+x cs")
 
-    def runAndCheckCmd(cmd: String, options: String*): Unit =
-      val (code, out) = execCmd(cmd, options*)
-      if code != 0 then
-        fail(s"Failed to run $cmd ${options.mkString(" ")}, exit code: $code, output: ${out.mkString("\n")}")
-
-    runAndCheckCmd("curl", s"-fLo cs https://git.io/coursier-cli-$ver")
-    runAndCheckCmd("chmod", "+x cs")