diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-01-13 16:23:59 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-01-13 17:04:19 +0100 |
| commit | c059815c58c2dc06d245ff791126e78d09b5b5a6 (patch) | |
| tree | 2a24733039ce09dc039d08ae37cfc9023f3a7670 | |
| parent | 66e73e022db9bc5309e2a22dbc4547e95e1c10cb (diff) | |
| download | dotty-c059815c58c2dc06d245ff791126e78d09b5b5a6.tar.gz dotty-c059815c58c2dc06d245ff791126e78d09b5b5a6.tar.bz2 dotty-c059815c58c2dc06d245ff791126e78d09b5b5a6.zip | |
Partest dotty non-bootstrapped.
Needs to go in before
https://github.com/scala/scala-jenkins-infra/pull/152
is deployed
| -rw-r--r-- | project/Build.scala | 3 | ||||
| -rwxr-xr-x | scripts/jobs/validate/partest | 2 | ||||
| -rwxr-xr-x | scripts/jobs/validate/partest-bootstrapped | 11 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/TreeChecker.scala | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/project/Build.scala b/project/Build.scala index e44a8413d..c8134954c 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -127,7 +127,8 @@ object DottyBuild extends Build { ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath } ) ++ addCommandAlias("partest", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++ - addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") + addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++ + addCommandAlias("partest-only-no-bootstrap", ";test:package;package; lockPartestFile;test:test-only dotc.tests;runPartestRunner") lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults) diff --git a/scripts/jobs/validate/partest b/scripts/jobs/validate/partest index 2f127f55b..4d4eb57e6 100755 --- a/scripts/jobs/validate/partest +++ b/scripts/jobs/validate/partest @@ -7,5 +7,5 @@ scriptsDir="$baseDir/scripts" git log --pretty=format:"%h - %an, %aD : %s" -n 10 update DarkDimius scala scala-scala dotty-library -sbt $sbtArgs update compile "partest-only --show-diff --verbose" +sbt $sbtArgs update compile "partest-only-no-bootstrap --show-diff --verbose" diff --git a/scripts/jobs/validate/partest-bootstrapped b/scripts/jobs/validate/partest-bootstrapped new file mode 100755 index 000000000..2f127f55b --- /dev/null +++ b/scripts/jobs/validate/partest-bootstrapped @@ -0,0 +1,11 @@ +#!/bin/bash -e + +baseDir=${WORKSPACE-`pwd`} +scriptsDir="$baseDir/scripts" +. $scriptsDir/common + +git log --pretty=format:"%h - %an, %aD : %s" -n 10 + +update DarkDimius scala scala-scala dotty-library +sbt $sbtArgs update compile "partest-only --show-diff --verbose" + diff --git a/src/dotty/tools/dotc/transform/TreeChecker.scala b/src/dotty/tools/dotc/transform/TreeChecker.scala index 0ee709539..daf76f471 100644 --- a/src/dotty/tools/dotc/transform/TreeChecker.scala +++ b/src/dotty/tools/dotc/transform/TreeChecker.scala @@ -123,7 +123,7 @@ class TreeChecker extends Phase with SymTransformer { val checker = new Checker(previousPhases(phasesToRun.toList)(ctx)) try checker.typedExpr(ctx.compilationUnit.tpdTree)(checkingCtx) catch { - case NonFatal(ex) => + case NonFatal(ex) => //TODO CHECK. Check that we are bootstrapped implicit val ctx: Context = checkingCtx ctx.println(i"*** error while checking ${ctx.compilationUnit} after phase ${checkingCtx.phase.prev} ***") ctx.println(ex.toString) |