@@ -487,7 +487,7 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
487
487
val maybeJs = Seq (" JS" -> Seq (" --js" ))
488
488
val maybeNative =
489
489
if (actualScalaVersion.startsWith(" 2." ))
490
- Seq (" Native " -> Seq (" --native" ))
490
+ Seq (" native " -> Seq (" --native" ))
491
491
else
492
492
Nil
493
493
Seq (" JVM" -> Nil ) ++ maybeJs ++ maybeNative
@@ -510,8 +510,14 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
510
510
|""" .stripMargin
511
511
)
512
512
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 )
515
521
if (baseRes.exitCode != 0 ) {
516
522
println(baseRes.out.text())
517
523
fail(" scala-cli test falied" , clues(baseRes.exitCode))
@@ -525,7 +531,16 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
525
531
.getOrElse(??? )
526
532
expect(! baseShouldThingLine.contains(" millisecond" ))
527
533
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
+ )
529
544
.call(cwd = root)
530
545
val output = res.out.text()
531
546
expect(output.contains(" A thing" ))
0 commit comments