luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix how fullClasspath is defined in TestBuildInfo

This commit is contained in:
Dale Wijnand 2018-02-01 13:38:00 +00:00
parent c1e0785a1f
commit c7cc52092e
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -455,7 +455,9 @@ lazy val sbtProj = (project in file("sbt"))
BuildInfoPlugin.buildInfoDefaultSettings, BuildInfoPlugin.buildInfoDefaultSettings,
addBuildInfoToConfig(Test), addBuildInfoToConfig(Test),
buildInfoObject in Test := "TestBuildInfo", buildInfoObject in Test := "TestBuildInfo",
buildInfoKeys in Test := Seq[BuildInfoKey](fullClasspath in Compile), buildInfoKeys in Test := Seq[BuildInfoKey](
BuildInfoKey.map(fullClasspath in Compile) { case (ident, cp) => ident -> cp.files },
),
connectInput in run in Test := true, connectInput in run in Test := true,
outputStrategy in run in Test := Some(StdoutOutput), outputStrategy in run in Test := Some(StdoutOutput),
fork in Test := true, fork in Test := true,

6
sbt/src/test/scala/sbt/RunFromSourceMain.scala
View File

@ -87,11 +87,7 @@ object RunFromSourceMain {
Nil Nil
) )
def mainClasspath = def mainClasspath = buildinfo.TestBuildInfo.fullClasspath.toArray
buildinfo.TestBuildInfo.fullClasspath.iterator
.map(s => file(s.stripPrefix("Attributed(").stripSuffix(")")))
.toArray
def loader = new java.net.URLClassLoader(mainClasspath map (_.toURI.toURL), null) def loader = new java.net.URLClassLoader(mainClasspath map (_.toURI.toURL), null)
def entryPoint = classOf[xMain] def entryPoint = classOf[xMain]
def mainClass = classOf[xMain] def mainClass = classOf[xMain]