Skip to content

Commit ac40e48

Browse files
committed
Downgrade Scala Native to 0.4.17 in scalatest integration tests
1 parent a78c078 commit ac40e48

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
487487
val maybeJs = Seq("JS" -> Seq("--js"))
488488
val maybeNative =
489489
if (actualScalaVersion.startsWith("2."))
490-
Seq("Native" -> Seq("--native"))
490+
Seq("native" -> Seq("--native"))
491491
else
492492
Nil
493493
Seq("JVM" -> Nil) ++ maybeJs ++ maybeNative
@@ -510,8 +510,14 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
510510
|""".stripMargin
511511
)
512512
inputs.fromRoot { root =>
513-
val baseRes = os.proc(TestUtil.cli, "test", extraOptions, platformArgs, ".")
514-
.call(cwd = root, check = false)
513+
val scalaTestExtraArgs =
514+
if (platformName == "native")
515+
// FIXME: revert to using default Scala Native version when scalatest supports 0.5.x
516+
Seq("--native-version", "0.4.17")
517+
else Nil
518+
val baseRes =
519+
os.proc(TestUtil.cli, "test", extraOptions, platformArgs, scalaTestExtraArgs, ".")
520+
.call(cwd = root, check = false)
515521
if (baseRes.exitCode != 0) {
516522
println(baseRes.out.text())
517523
fail("scala-cli test falied", clues(baseRes.exitCode))
@@ -525,7 +531,16 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
525531
.getOrElse(???)
526532
expect(!baseShouldThingLine.contains("millisecond"))
527533

528-
val res = os.proc(TestUtil.cli, "test", extraOptions, platformArgs, ".", "--", "-oD")
534+
val res = os.proc(
535+
TestUtil.cli,
536+
"test",
537+
extraOptions,
538+
platformArgs,
539+
scalaTestExtraArgs,
540+
".",
541+
"--",
542+
"-oD"
543+
)
529544
.call(cwd = root)
530545
val output = res.out.text()
531546
expect(output.contains("A thing"))

0 commit comments

Comments
 (0)