Skip to content

Commit da661c8

Browse files
committed
Merge pull request #1024 from dotty-staging/partest-non-bootstrapped
Partest dotty non-bootstrapped.
2 parents 66e73e0 + c059815 commit da661c8

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

project/Build.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ object DottyBuild extends Build {
127127
("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath
128128
}
129129
) ++ addCommandAlias("partest", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++
130-
addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner")
130+
addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++
131+
addCommandAlias("partest-only-no-bootstrap", ";test:package;package; lockPartestFile;test:test-only dotc.tests;runPartestRunner")
131132

132133
lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults)
133134

scripts/jobs/validate/partest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ scriptsDir="$baseDir/scripts"
77
git log --pretty=format:"%h - %an, %aD : %s" -n 10
88

99
update DarkDimius scala scala-scala dotty-library
10-
sbt $sbtArgs update compile "partest-only --show-diff --verbose"
10+
sbt $sbtArgs update compile "partest-only-no-bootstrap --show-diff --verbose"
1111

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash -e
2+
3+
baseDir=${WORKSPACE-`pwd`}
4+
scriptsDir="$baseDir/scripts"
5+
. $scriptsDir/common
6+
7+
git log --pretty=format:"%h - %an, %aD : %s" -n 10
8+
9+
update DarkDimius scala scala-scala dotty-library
10+
sbt $sbtArgs update compile "partest-only --show-diff --verbose"
11+

src/dotty/tools/dotc/transform/TreeChecker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class TreeChecker extends Phase with SymTransformer {
123123
val checker = new Checker(previousPhases(phasesToRun.toList)(ctx))
124124
try checker.typedExpr(ctx.compilationUnit.tpdTree)(checkingCtx)
125125
catch {
126-
case NonFatal(ex) =>
126+
case NonFatal(ex) => //TODO CHECK. Check that we are bootstrapped
127127
implicit val ctx: Context = checkingCtx
128128
ctx.println(i"*** error while checking ${ctx.compilationUnit} after phase ${checkingCtx.phase.prev} ***")
129129
ctx.println(ex.toString)

0 commit comments

Comments
 (0)