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

Update reflection signature for scripted plugin, add test for the plugin.

This commit is contained in:
Mark Harrah 2013-05-25 13:36:17 -04:00
parent 598b6209e3
commit fd713e0c96
9 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sbt/src/sbt-test/project/scripted-plugin/build.sbt Normal file
View File

@ -0,0 +1 @@
ScriptedPlugin.scriptedSettings

1
sbt/src/sbt-test/project/scripted-plugin/changes/Fail.scala Normal file
View File

@ -0,0 +1 @@
object Fail {

1
sbt/src/sbt-test/project/scripted-plugin/changes/Success.scala Normal file
View File

@ -0,0 +1 @@
object Success

1
sbt/src/sbt-test/project/scripted-plugin/changes/fail Normal file
View File

@ -0,0 +1 @@
-> compile

4
sbt/src/sbt-test/project/scripted-plugin/changes/test Normal file
View File

@ -0,0 +1,4 @@
$ copy-file changes/Success.scala Success.scala
> compile
$ copy-file changes/Fail.scala Fail.scala
-> compile

3
sbt/src/sbt-test/project/scripted-plugin/project/plugins.sbt Normal file
View File

@ -0,0 +1,3 @@
libraryDependencies <+= sbtVersion { sv =>
"org.scala-sbt" % "scripted-plugin" % sv
}

6
sbt/src/sbt-test/project/scripted-plugin/test Normal file
View File

@ -0,0 +1,6 @@
$ copy-file changes/test src/sbt-test/group/demo/test
$ copy-file changes/Fail.scala src/sbt-test/group/demo/changes/Fail.scala
$ copy-file changes/Success.scala src/sbt-test/group/demo/changes/Success.scala
$ copy-file changes/fail src/sbt-test/group/fail/test
> scripted group/demo
-> scripted group/fail

2
scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
View File

@ -32,7 +32,7 @@ object ScriptedPlugin extends Plugin {
def scriptedRunTask: Initialize[Task[Method]] = (scriptedTests) map {
(m) =>
m.getClass.getMethod("run", classOf[File], classOf[Boolean], classOf[String], classOf[String], classOf[String], classOf[Array[String]], classOf[File], classOf[Array[String]])
m.getClass.getMethod("run", classOf[File], classOf[Boolean], classOf[Array[String]], classOf[File], classOf[Array[String]])
}
def scriptedTask: Initialize[InputTask[Unit]] = Def.inputTask {

2
scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
View File

@ -119,7 +119,7 @@ object ScriptedTests
}
def runAll(tests: Seq[() => Option[String]])
{
val errors = for(test <- tests.par; err <- test()) yield err
val errors = for(test <- tests; err <- test()) yield err
if(errors.nonEmpty)
sys.error(errors.mkString("Failed tests:\n\t", "\n\t", "\n"))
}