Skip to content

Commit 36e6543

Browse files
committed
Don't run irrelevant tests for LTS RC
1 parent 08ebc3f commit 36e6543

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -907,18 +907,21 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
907907
}
908908
}
909909

910-
test("scalac help respects --cli-default-scala-version") {
911-
TestInputs.empty.fromRoot { root =>
912-
val sv = Constants.scala3NextRc
913-
val launcherVersionOverrideHelp =
914-
os.proc(TestUtil.cli, "--cli-default-scala-version", sv, "--scalac-help")
915-
.call(cwd = root).out.trim()
916-
val standardVersionOverrideHelp =
917-
os.proc(TestUtil.cli, "--scalac-help", "-S", sv)
918-
.call(cwd = root).out.trim()
919-
val migrationPrefix = sv.take(2) + (sv.charAt(2).asDigit + 1).toString
920-
expect(launcherVersionOverrideHelp.contains(s"$migrationPrefix-migration"))
921-
expect(launcherVersionOverrideHelp == standardVersionOverrideHelp)
910+
// this check is just to ensure this isn't being run for LTS RC jobs
911+
// should be adjusted when a new LTS line is released
912+
if (!Constants.scala3NextRc.startsWith(Constants.scala3LtsPrefix))
913+
test("scalac help respects --cli-default-scala-version") {
914+
TestInputs.empty.fromRoot { root =>
915+
val sv = Constants.scala3NextRc
916+
val launcherVersionOverrideHelp =
917+
os.proc(TestUtil.cli, "--cli-default-scala-version", sv, "--scalac-help")
918+
.call(cwd = root).out.trim()
919+
val standardVersionOverrideHelp =
920+
os.proc(TestUtil.cli, "--scalac-help", "-S", sv)
921+
.call(cwd = root).out.trim()
922+
val migrationPrefix = sv.take(2) + (sv.charAt(2).asDigit + 1).toString
923+
expect(launcherVersionOverrideHelp.contains(s"$migrationPrefix-migration"))
924+
expect(launcherVersionOverrideHelp == standardVersionOverrideHelp)
925+
}
922926
}
923-
}
924927
}

0 commit comments

Comments
 (0)