From 232597258b465c31f5b07aaa9291cb3bb06fc4b6 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 13 Aug 2021 09:20:45 +0100
Subject: [PATCH] Move bootstrapped cmd test to bootstrapCmdTests

---
 project/scripts/bootstrapCmdTests | 4 ++++
 project/scripts/cmdTests          | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests
index 9f8956e1d23c..ea490731afe3 100755
--- a/project/scripts/bootstrapCmdTests
+++ b/project/scripts/bootstrapCmdTests
@@ -53,6 +53,10 @@ clear_out "$OUT"
 ./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp"
 grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"
 
+echo "testing sbt scalac with suspension"
+clear_out "$OUT"
+"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala"  > "$tmp"
+
 # echo ":quit" | ./dist/target/pack/bin/scala  # not supported by CI
 
 echo "testing ./bin/scaladoc"
diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests
index e486b0f5cc50..659b2808ed07 100755
--- a/project/scripts/cmdTests
+++ b/project/scripts/cmdTests
@@ -7,7 +7,7 @@ echo "testing sbt scalac and scala"
 "$SBT" ";scalac $SOURCE -d $OUT ;scala -classpath $OUT $MAIN" > "$tmp"
 grep -qe "$EXPECTED_OUTPUT" "$tmp"
 
-# check that `sbt scalac` compiles and `sbt scala` runs it
+# check that `sbt scalac -from-tasty` compiles and `sbt scala` runs it
 echo "testing sbt scalac -from-tasty and scala -classpath"
 clear_out "$OUT"
 "$SBT" ";scalac $SOURCE -d $OUT ;scalac -from-tasty -d $OUT1 $OUT/$TASTY ;scala -classpath $OUT1 $MAIN" > "$tmp"
@@ -47,10 +47,6 @@ if grep -q "tests/pos/i10430/app.scala" "$tmp"; then
   exit 1
 fi
 
-echo "testing sbt scalac with suspension"
-clear_out "$OUT"
-"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala"  > "$tmp"
-
 # check that missing source file does not crash message rendering
 echo "testing that missing source file does not crash message rendering"
 clear_out "$OUT"