From 47015bc8d8a3c917f1f1333da9003f0c2678e8b1 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 28 Nov 2018 15:52:28 +0100 Subject: [PATCH 1/2] Add regression test for `dotc -decompile xyz.tasty` --- project/scripts/cmdTests | 4 ++++ project/scripts/cmdTestsCommon.inc.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 07d631944a7c..64b77f71df63 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -18,6 +18,10 @@ echo "testing sbt dotc -decompile" "$SBT" ";dotc -decompile -color:never -classpath $OUT $MAIN" > "$tmp" grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp" +echo "testing sbt dotc -decompile from file" +"$SBT" ";dotc -decompile -color:never -classpath $OUT $OUT/$TASTY" #> "$tmp" +grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp" + echo "testing sbt dotr with no -classpath" clear_out "$OUT" "$SBT" ";dotc $SOURCE ; dotr $MAIN" > "$tmp" diff --git a/project/scripts/cmdTestsCommon.inc.sh b/project/scripts/cmdTestsCommon.inc.sh index a5e3ed7c1c5f..1247481aec12 100644 --- a/project/scripts/cmdTestsCommon.inc.sh +++ b/project/scripts/cmdTestsCommon.inc.sh @@ -5,6 +5,7 @@ SBT="./project/scripts/sbt" # if run on CI SOURCE="tests/pos/HelloWorld.scala" MAIN="HelloWorld" +TASTY="HelloWorld.tasty" EXPECTED_OUTPUT="hello world" OUT=$(mktemp -d) From 99b33c8e9d6b42d5d9c5eece5511c67b44947bd4 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 29 Nov 2018 19:10:20 +0100 Subject: [PATCH 2/2] Remove comment --- project/scripts/cmdTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 64b77f71df63..1704fe749d14 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -19,7 +19,7 @@ echo "testing sbt dotc -decompile" grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp" echo "testing sbt dotc -decompile from file" -"$SBT" ";dotc -decompile -color:never -classpath $OUT $OUT/$TASTY" #> "$tmp" +"$SBT" ";dotc -decompile -color:never -classpath $OUT $OUT/$TASTY" > "$tmp" grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp" echo "testing sbt dotr with no -classpath"