chore: Try fix windows issues

Author: tgodzik

modules/integration/src/test/scala/scala/cli/integration/CompileTestDefinitions.scala

@@ -748,17 +748,17 @@ abstract class CompileTestDefinitions
            |""".stripMargin
     )
     inputs.fromRoot { root =>
-      val result = os.proc(TestUtil.cli, "compile", ".").call(
+      val result = os.proc(TestUtil.cli, "compile", ".", extraOptions).call(
         cwd = root,
         check = false,
         mergeErrIntoOut = true
       )
 
       assertEquals(
         TestUtil.fullStableOutput(result),
-        s"""|Compiling project (Scala ${Constants.scala3Next}, JVM (${Constants
+        s"""|Compiling project (Scala $actualScalaVersion, JVM (${Constants
              .defaultGraalVMJavaVersion}))
-            |Compiled project (Scala ${Constants.scala3Next}, JVM (${Constants
+            |Compiled project (Scala $actualScalaVersion, JVM (${Constants
              .defaultGraalVMJavaVersion}))""".stripMargin
       )
 
@@ -770,22 +770,29 @@ abstract class CompileTestDefinitions
            |""".stripMargin
       )
 
-      val result2 = os.proc(TestUtil.cli, "compile", ".").call(
+      val result2 = os.proc(TestUtil.cli, "compile", ".", extraOptions).call(
         cwd = root,
         check = false,
         mergeErrIntoOut = true
       )
 
+      val expectedError = if (actualScalaVersion.startsWith("2"))
+        """|[error] type mismatch;
+           |[error]  found   : Int(1)
+           |[error]  required: String""".stripMargin
+      else
+        """|[error] Found:    (1 : Int)
+           |[error] Required: String""".stripMargin
+
       assertEquals(
-        TestUtil.fullStableOutput(result2),
-        s"""|Compiling project (Scala ${Constants.scala3Next}, JVM (${Constants
+        TestUtil.fullStableOutput(result2).trim,
+        s"""|Compiling project (Scala $actualScalaVersion, JVM (${Constants
              .defaultGraalVMJavaVersion}))
-            |[error] ./Main.scala:2:23
-            |[error] Found:    (1 : Int)
-            |[error] Required: String
+            |[error] .${File.separatorChar}Main.scala:2:23
+            |$expectedError
             |[error]     val msg: String = 1
             |[error]                       ^
-            |Error compiling project (Scala ${Constants.scala3Next}, JVM (${Constants
+            |Error compiling project (Scala $actualScalaVersion, JVM (${Constants
              .defaultGraalVMJavaVersion}))
             |Compilation failed""".stripMargin
       )
@@ -798,17 +805,17 @@ abstract class CompileTestDefinitions
            |""".stripMargin
       )
 
-      val result3 = os.proc(TestUtil.cli, "compile", ".").call(
+      val result3 = os.proc(TestUtil.cli, "compile", ".", extraOptions).call(
         cwd = root,
         check = false,
         mergeErrIntoOut = true
       )
 
       assertEquals(
         TestUtil.fullStableOutput(result3),
-        s"""|Compiling project (Scala ${Constants.scala3Next}, JVM (${Constants
+        s"""|Compiling project (Scala $actualScalaVersion, JVM (${Constants
              .defaultGraalVMJavaVersion}))
-            |Compiled project (Scala ${Constants.scala3Next}, JVM (${Constants
+            |Compiled project (Scala $actualScalaVersion, JVM (${Constants
              .defaultGraalVMJavaVersion}))""".stripMargin
       )
 

modules/integration/src/test/scala/scala/cli/integration/CompileTests213.scala

@@ -1,7 +1,6 @@
 package scala.cli.integration
 
 import scala.util.Properties
-import scala.cli.integration.Constants.defaultGraalVMJavaVersion
 
 class CompileTests213 extends CompileTestDefinitions with Test213 {
 

modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala

@@ -115,11 +115,12 @@ object TestUtil {
   def removeAnsiColors(str: String) = str.replaceAll("\\e\\[[0-9]+m", "")
 
   def fullStableOutput(result: os.CommandResult) =
-    TestUtil.removeAnsiColors(result.toString).trim().linesIterator.filterNot { str =>
+    removeAnsiColors(result.toString).trim().linesIterator.filterNot { str =>
       // these lines are not stable and can easily change
-      val shouldNotContain = Set("Starting compilation server", "hint", "Download", "Result of")
+      val shouldNotContain =
+        Set("Starting compilation server", "hint", "Download", "Result of", "Checking", "Checked")
       shouldNotContain.exists(str.contains)
-    }.mkString("\n")
+    }.mkString(System.lineSeparator())
 
   def retry[T](
     maxAttempts: Int = 3,