aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Petrashko <dmitry.petrashko@gmail.com>2015-10-22 18:20:28 +0200
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-10-23 10:41:29 +0200
commit45a9074c5184be6cc715ab4f0872ea834c5908d7 (patch)
treeb940c0c717f67a5caee31ea50f50fc1d4b156a77
parentacd7b9d31cd0a2fbc285921bdc5a7bdc9c1d2872 (diff)
downloaddotty-45a9074c5184be6cc715ab4f0872ea834c5908d7.tar.gz
dotty-45a9074c5184be6cc715ab4f0872ea834c5908d7.tar.bz2
dotty-45a9074c5184be6cc715ab4f0872ea834c5908d7.zip
Run partest under bootstrapped dotty.
-rw-r--r--project/Build.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/project/Build.scala b/project/Build.scala
index be39358ff..442ac3c2f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -81,7 +81,7 @@ object DottyBuild extends Build {
val args = Def.spaceDelimited("<arg>").parsed
val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
- val dottyJars = "-dottyJars " + jars.length + " " + jars.mkString(" ")
+ val dottyJars = "-dottyJars " + (jars.length + 1) + " dotty.jar" + " " + jars.mkString(" ")
// Provide the jars required on the classpath of run tests
runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
},
@@ -118,8 +118,8 @@ object DottyBuild extends Build {
("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath
}
- ) ++ addCommandAlias("partest", ";test:package;package;lockPartestFile;test:test;runPartestRunner") ++
- addCommandAlias("partest-only", ";test:package;package;lockPartestFile;test:test-only dotc.tests;runPartestRunner")
+ ) ++ 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")
lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults)