Skip to content

Commit 9aeb1b9

Browse files
committed
merge sbtBootstrappedTests with cmdTests
1 parent 3a45c04 commit 9aeb1b9

File tree

3 files changed

+21
-36
lines changed

3 files changed

+21
-36
lines changed

.drone.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ pipeline:
3535
commands:
3636
- cp -R . /tmp/2/ && cd /tmp/2/
3737
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
38-
- ./project/scripts/sbtBootstrappedTests
3938

4039
test_optimised:
4140
group: test

project/scripts/cmdTests

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,27 @@ else
6969
exit -1
7070
fi
7171

72+
73+
# check that benchmarks can run
74+
./project/scripts/sbt "dotty-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala"
75+
76+
# setup for `dotc`/`dotr` script tests
77+
./project/scripts/sbt dist-bootstrapped/pack
78+
79+
# check that `dotc` compiles and `dotr` runs it
80+
echo "testing ./bin/dotc and ./bin/dotr"
81+
mkdir out/scriptedtest0
82+
./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest0
83+
./bin/dotr -classpath out/scriptedtest0 dotrtest.Test
84+
85+
# check that `dotc -from-tasty` compiles and `dotr` runs it
86+
echo "testing ./bin/dotc -from-tasty and dotr -classpath"
87+
mkdir out/scriptedtest1
88+
mkdir out/scriptedtest2
89+
./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/
90+
./bin/dotc -from-tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test
91+
./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test
92+
7293
./project/scripts/sbt ";dist-bootstrapped/pack"
7394
./dist-bootstrapped/target/pack/bin/dotc tests/run/hello.scala
7495
./dist-bootstrapped/target/pack/bin/dotr Test

project/scripts/sbtBootstrappedTests

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)