Merge pull request #3164 from Gedochao/maintenance/adjust-tests-for-Scala-3.3.4

Adjust tests for Scala 3.3.4

Author: Gedochao

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

@@ -42,6 +42,9 @@ abstract class DocTestDefinitions extends ScalaCliSuite with TestScalaVersionArg
           )
         else if (
           actualScalaVersion.coursierVersion >= "3.5.0".coursierVersion ||
+          (actualScalaVersion.coursierVersion >= "3.3.4".coursierVersion &&
+          actualScalaVersion.coursierVersion < "3.4.0".coursierVersion) ||
+          actualScalaVersion.startsWith("3.3.4") ||
           actualScalaVersion.startsWith("3.5")
         )
           Seq(

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

@@ -912,6 +912,9 @@ abstract class PackageTestDefinitions extends ScalaCliSuite with TestScalaVersio
           )
         else if (
           actualScalaVersion.coursierVersion >= "3.5.0".coursierVersion ||
+          (actualScalaVersion.coursierVersion >= "3.3.4".coursierVersion &&
+          actualScalaVersion.coursierVersion < "3.4.0".coursierVersion) ||
+          actualScalaVersion.startsWith("3.3.4") ||
           actualScalaVersion.startsWith("3.5")
         )
           Seq(

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

@@ -907,18 +907,21 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
       }
     }
 
-  test("scalac help respects --cli-default-scala-version") {
-    TestInputs.empty.fromRoot { root =>
-      val sv = Constants.scala3NextRc
-      val launcherVersionOverrideHelp =
-        os.proc(TestUtil.cli, "--cli-default-scala-version", sv, "--scalac-help")
-          .call(cwd = root).out.trim()
-      val standardVersionOverrideHelp =
-        os.proc(TestUtil.cli, "--scalac-help", "-S", sv)
-          .call(cwd = root).out.trim()
-      val migrationPrefix = sv.take(2) + (sv.charAt(2).asDigit + 1).toString
-      expect(launcherVersionOverrideHelp.contains(s"$migrationPrefix-migration"))
-      expect(launcherVersionOverrideHelp == standardVersionOverrideHelp)
+  // this check is just to ensure this isn't being run for LTS RC jobs
+  // should be adjusted when a new LTS line is released
+  if (!Constants.scala3NextRc.startsWith(Constants.scala3LtsPrefix))
+    test("scalac help respects --cli-default-scala-version") {
+      TestInputs.empty.fromRoot { root =>
+        val sv = Constants.scala3NextRc
+        val launcherVersionOverrideHelp =
+          os.proc(TestUtil.cli, "--cli-default-scala-version", sv, "--scalac-help")
+            .call(cwd = root).out.trim()
+        val standardVersionOverrideHelp =
+          os.proc(TestUtil.cli, "--scalac-help", "-S", sv)
+            .call(cwd = root).out.trim()
+        val migrationPrefix = sv.take(2) + (sv.charAt(2).asDigit + 1).toString
+        expect(launcherVersionOverrideHelp.contains(s"$migrationPrefix-migration"))
+        expect(launcherVersionOverrideHelp == standardVersionOverrideHelp)
+      }
     }
-  }
 }