From 90a5edec25761e06839e48b389003a949ad81afd Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Tue, 23 Jan 2018 14:55:01 +0100 Subject: [PATCH 01/11] Fix #3886: add tests for dotc/dotr/dotd --- .drone.yml | 2 +- project/scripts/{sbtTests => cmdTests} | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) rename project/scripts/{sbtTests => cmdTests} (87%) diff --git a/.drone.yml b/.drone.yml index e8b0eaa00c02..f283864e8a97 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ pipeline: commands: - cp -R . /tmp/1/ && cd /tmp/1/ - ./project/scripts/sbt ";compile ;test" - - ./project/scripts/sbtTests + - ./project/scripts/cmdTests test_bootstrapped: group: test diff --git a/project/scripts/sbtTests b/project/scripts/cmdTests similarity index 87% rename from project/scripts/sbtTests rename to project/scripts/cmdTests index 4e5349a98f26..70037cc1f2ee 100755 --- a/project/scripts/sbtTests +++ b/project/scripts/cmdTests @@ -66,3 +66,9 @@ else echo "failed output check" exit -1 fi + +./project/scripts/sbt ";dist-bootstrapped/pack" +./dist-bootstrapped/target/pack/bin/dotc tests/run/hello.scala +./dist-bootstrapped/target/pack/bin/dotr Test +echo ":quit" | ./dist-bootstrapped/target/pack/bin/dotr +mkdir -p _site && ./dist-bootstrapped/target/pack/bin/dotd -project Hello -siteroot _site tests/run/hello.scala From e32d2387fa33442ff60ab229190c5a0677826f6a Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Tue, 23 Jan 2018 17:30:42 +0100 Subject: [PATCH 02/11] address review: add `set -eux` --- project/scripts/cmdTests | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 70037cc1f2ee..f8a4c2045c93 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -eux + # check that benchmarks can run ./project/scripts/sbt "dotty-bench/jmh:run 1 1 tests/pos/alias.scala" From a36f49dd709358e8b4d2bca02ff8b1c42cb4235e Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Wed, 24 Jan 2018 13:19:33 +0100 Subject: [PATCH 03/11] add `set -eux` to sbtBootstrappedTests --- project/scripts/sbtBootstrappedTests | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/scripts/sbtBootstrappedTests b/project/scripts/sbtBootstrappedTests index aaa0dfe3af4f..aa7e1214ef3d 100755 --- a/project/scripts/sbtBootstrappedTests +++ b/project/scripts/sbtBootstrappedTests @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -eux + # check that benchmarks can run ./project/scripts/sbt "dotty-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala" From 8388c4b1829e83637262b445c82063609f7bafa5 Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Wed, 24 Jan 2018 13:33:21 +0100 Subject: [PATCH 04/11] disable repl test on CI --- project/scripts/cmdTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index f8a4c2045c93..a1d64b9a1f6c 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -72,5 +72,5 @@ fi ./project/scripts/sbt ";dist-bootstrapped/pack" ./dist-bootstrapped/target/pack/bin/dotc tests/run/hello.scala ./dist-bootstrapped/target/pack/bin/dotr Test -echo ":quit" | ./dist-bootstrapped/target/pack/bin/dotr +# echo ":quit" | ./dist-bootstrapped/target/pack/bin/dotr # not supported by CI mkdir -p _site && ./dist-bootstrapped/target/pack/bin/dotd -project Hello -siteroot _site tests/run/hello.scala From f8b059a32a6abe197118058475c5396604d30d7b Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Wed, 24 Jan 2018 14:15:31 +0100 Subject: [PATCH 05/11] fix erroneous redundant quote --- project/scripts/sbtBootstrappedTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/sbtBootstrappedTests b/project/scripts/sbtBootstrappedTests index aa7e1214ef3d..c0932c5a98e9 100755 --- a/project/scripts/sbtBootstrappedTests +++ b/project/scripts/sbtBootstrappedTests @@ -13,7 +13,7 @@ echo "testing ./bin/dotc and ./bin/dotr" mkdir out/scriptedtest0 ./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest0 -./bin/dotr -classpath out/scriptedtest0 dotrtest.Test" > sbtdotr1.out +./bin/dotr -classpath out/scriptedtest0 dotrtest.Test > sbtdotr1.out if grep -e "dotr test ok" sbtdotr1.out; then echo "output ok" else From 3a45c04fb128920b40d25c269a92f2c573d44834 Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Wed, 24 Jan 2018 15:15:45 +0100 Subject: [PATCH 06/11] remove another erroneous redundant quote --- project/scripts/sbtBootstrappedTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/sbtBootstrappedTests b/project/scripts/sbtBootstrappedTests index c0932c5a98e9..597fbdcf9c55 100755 --- a/project/scripts/sbtBootstrappedTests +++ b/project/scripts/sbtBootstrappedTests @@ -27,7 +27,7 @@ mkdir out/scriptedtest1 mkdir out/scriptedtest2 ./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/ ./bin/dotc -from-tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test -./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test" > sbtdotr2.out +./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test > sbtdotr2.out if grep -e "dotr test ok" sbtdotr2.out; then echo "output ok" else From 9aeb1b980ad97ef839dbf71a60d44aa61d47b1ee Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Wed, 24 Jan 2018 15:15:45 +0100 Subject: [PATCH 07/11] merge sbtBootstrappedTests with cmdTests --- .drone.yml | 1 - project/scripts/cmdTests | 21 +++++++++++++++++ project/scripts/sbtBootstrappedTests | 35 ---------------------------- 3 files changed, 21 insertions(+), 36 deletions(-) delete mode 100755 project/scripts/sbtBootstrappedTests diff --git a/.drone.yml b/.drone.yml index f283864e8a97..2cbbadfdddbd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,6 @@ pipeline: commands: - cp -R . /tmp/2/ && cd /tmp/2/ - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test" - - ./project/scripts/sbtBootstrappedTests test_optimised: group: test diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index a1d64b9a1f6c..c1f4106b9c3e 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -69,6 +69,27 @@ else exit -1 fi + +# check that benchmarks can run +./project/scripts/sbt "dotty-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala" + +# setup for `dotc`/`dotr` script tests +./project/scripts/sbt dist-bootstrapped/pack + +# check that `dotc` compiles and `dotr` runs it +echo "testing ./bin/dotc and ./bin/dotr" +mkdir out/scriptedtest0 +./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest0 +./bin/dotr -classpath out/scriptedtest0 dotrtest.Test + +# check that `dotc -from-tasty` compiles and `dotr` runs it +echo "testing ./bin/dotc -from-tasty and dotr -classpath" +mkdir out/scriptedtest1 +mkdir out/scriptedtest2 +./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/ +./bin/dotc -from-tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test +./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test + ./project/scripts/sbt ";dist-bootstrapped/pack" ./dist-bootstrapped/target/pack/bin/dotc tests/run/hello.scala ./dist-bootstrapped/target/pack/bin/dotr Test diff --git a/project/scripts/sbtBootstrappedTests b/project/scripts/sbtBootstrappedTests deleted file mode 100755 index 597fbdcf9c55..000000000000 --- a/project/scripts/sbtBootstrappedTests +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -# check that benchmarks can run -./project/scripts/sbt "dotty-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala" - -# setup for `dotc`/`dotr` script tests -./project/scripts/sbt dist-bootstrapped/pack - -# check that `dotc` compiles and `dotr` runs it -echo "testing ./bin/dotc and ./bin/dotr" -mkdir out/scriptedtest0 -./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest0 - -./bin/dotr -classpath out/scriptedtest0 dotrtest.Test > sbtdotr1.out -if grep -e "dotr test ok" sbtdotr1.out; then - echo "output ok" -else - exit -1 -fi - - -# check that `dotc` compiles and `dotr` runs it -echo "testing ./bin/dotc -from-tasty and dotr -classpath" -mkdir out/scriptedtest1 -mkdir out/scriptedtest2 -./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/ -./bin/dotc -from-tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test -./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test > sbtdotr2.out -if grep -e "dotr test ok" sbtdotr2.out; then - echo "output ok" -else - exit -1 -fi From e7653fced1e6ded679336ed13f540aef8d41c354 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Wed, 24 Jan 2018 17:57:07 +0100 Subject: [PATCH 08/11] fix dir creation failure --- project/scripts/cmdTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index c1f4106b9c3e..57ba11034469 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -78,7 +78,7 @@ fi # check that `dotc` compiles and `dotr` runs it echo "testing ./bin/dotc and ./bin/dotr" -mkdir out/scriptedtest0 +mkdir -p out/scriptedtest0 ./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest0 ./bin/dotr -classpath out/scriptedtest0 dotrtest.Test From e7ef82d998a2582c7babd525c34d4a3d04cf9b15 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Wed, 24 Jan 2018 21:47:43 +0100 Subject: [PATCH 09/11] fix mkdir with `-p` --- project/scripts/cmdTests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 57ba11034469..aab020c3b17b 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -84,8 +84,8 @@ mkdir -p out/scriptedtest0 # check that `dotc -from-tasty` compiles and `dotr` runs it echo "testing ./bin/dotc -from-tasty and dotr -classpath" -mkdir out/scriptedtest1 -mkdir out/scriptedtest2 +mkdir -p out/scriptedtest1 +mkdir -p out/scriptedtest2 ./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/ ./bin/dotc -from-tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test ./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test From 4d6498794f602b8daca721de1a8c8117f399dd4e Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Fri, 26 Jan 2018 13:46:09 +0100 Subject: [PATCH 10/11] remove redundant tests --- project/scripts/cmdTests | 3 --- 1 file changed, 3 deletions(-) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index aab020c3b17b..090194035e36 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -90,8 +90,5 @@ mkdir -p out/scriptedtest2 ./bin/dotc -from-tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test ./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test -./project/scripts/sbt ";dist-bootstrapped/pack" -./dist-bootstrapped/target/pack/bin/dotc tests/run/hello.scala -./dist-bootstrapped/target/pack/bin/dotr Test # echo ":quit" | ./dist-bootstrapped/target/pack/bin/dotr # not supported by CI mkdir -p _site && ./dist-bootstrapped/target/pack/bin/dotd -project Hello -siteroot _site tests/run/hello.scala From df14e431b68d299daba4949d9a0a941ab6e06b62 Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Fri, 26 Jan 2018 13:51:20 +0100 Subject: [PATCH 11/11] add bin/dotd --- bin/dotd | 5 +++++ project/scripts/cmdTests | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 bin/dotd diff --git a/bin/dotd b/bin/dotd new file mode 100755 index 000000000000..ef20298de154 --- /dev/null +++ b/bin/dotd @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.." + +eval "$ROOT/bin/common" "$ROOT/dist-bootstrapped/target/pack/bin/dotd" "$@" diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 090194035e36..ce15c34f48ff 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -91,4 +91,4 @@ mkdir -p out/scriptedtest2 ./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test # echo ":quit" | ./dist-bootstrapped/target/pack/bin/dotr # not supported by CI -mkdir -p _site && ./dist-bootstrapped/target/pack/bin/dotd -project Hello -siteroot _site tests/run/hello.scala +mkdir -p _site && ./bin/dotd -project Hello -siteroot _site tests/run/hello.scala