Skip to content

Commit 45a9074

Browse files
committed
Run partest under bootstrapped dotty.
1 parent acd7b9d commit 45a9074

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

project/Build.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ object DottyBuild extends Build {
8181
val args = Def.spaceDelimited("<arg>").parsed
8282
val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
8383
getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
84-
val dottyJars = "-dottyJars " + jars.length + " " + jars.mkString(" ")
84+
val dottyJars = "-dottyJars " + (jars.length + 1) + " dotty.jar" + " " + jars.mkString(" ")
8585
// Provide the jars required on the classpath of run tests
8686
runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
8787
},
@@ -118,8 +118,8 @@ object DottyBuild extends Build {
118118

119119
("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath
120120
}
121-
) ++ addCommandAlias("partest", ";test:package;package;lockPartestFile;test:test;runPartestRunner") ++
122-
addCommandAlias("partest-only", ";test:package;package;lockPartestFile;test:test-only dotc.tests;runPartestRunner")
121+
) ++ addCommandAlias("partest", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++
122+
addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner")
123123

124124
lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults)
125125

0 commit comments

Comments
 (0)