diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-05-27 23:44:59 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-05-28 12:31:04 +0200 |
| commit | e693e66c105e8f13f0e056eccb43b8a65146c8e8 (patch) | |
| tree | 383a93f8d9bc93a8d57f075eb268bc910ccf2158 /project/Build.scala | |
| parent | c0b693060c666f66cc5f26462e95f74b68975f31 (diff) | |
| download | dotty-e693e66c105e8f13f0e056eccb43b8a65146c8e8.tar.gz dotty-e693e66c105e8f13f0e056eccb43b8a65146c8e8.tar.bz2 dotty-e693e66c105e8f13f0e056eccb43b8a65146c8e8.zip | |
Package dotty before running partest.
To make sure that artifact is the same.
Diffstat (limited to 'project/Build.scala')
| -rw-r--r-- | project/Build.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/project/Build.scala b/project/Build.scala index d29b6a76e..79cb7d9b7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -79,7 +79,7 @@ object DottyBuild extends Build { // command line arguments get passed to the last task in an aliased // sequence (see partest alias below), so this works. val args = Def.spaceDelimited("<arg>").parsed - val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++ + val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++ getJarPaths(partestDeps.value, ivyPaths.value.ivyHome) val dottyJars = "-dottyJars " + jars.length + " " + jars.mkString(" ") // Provide the jars required on the classpath of run tests @@ -118,8 +118,8 @@ object DottyBuild extends Build { ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath } - ) ++ addCommandAlias("partest", ";test:compile;lockPartestFile;test:test;runPartestRunner") ++ - addCommandAlias("partest-only", ";test:compile;lockPartestFile;test:test-only dotc.tests;runPartestRunner") + ) ++ addCommandAlias("partest", ";test:package;package;lockPartestFile;test:test;runPartestRunner") ++ + addCommandAlias("partest-only", ";test:package;package;lockPartestFile;test:test-only dotc.tests;runPartestRunner") lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults) @@ -179,9 +179,9 @@ object DottyBuild extends Build { lazy val partestDeps = SettingKey[Seq[ModuleID]]("partestDeps", "Finds jars for partest dependencies") def getJarPaths(modules: Seq[ModuleID], ivyHome: Option[File]): Seq[String] = ivyHome match { - case Some(home) => - modules.map({ module => - val file = Path(home) / Path("cache") / + case Some(home) => + modules.map({ module => + val file = Path(home) / Path("cache") / Path(module.organization) / Path(module.name) / Path("jars") / Path(module.name + "-" + module.revision + ".jar") if (!file.isFile) throw new RuntimeException("ERROR: sbt getJarPaths: dependency jar not found: " + file) |