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

fixes for scripted testing, bump version to 0.7.4

This commit is contained in:
Mark Harrah 2010-05-16 20:46:23 -04:00
parent c9271e0904
commit 0d339f1948
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbt/scripted/project/build.properties
View File

@ -1,7 +1,7 @@
project.name=scripted project.name=scripted
project.organization=org.scala-tools.sbt project.organization=org.scala-tools.sbt
project.version=0.7.2-SNAPSHOT project.version=0.7.4
sbt.version=0.7.1 sbt.version=0.7.4
def.scala.version=2.7.7 def.scala.version=2.7.7
build.scala.versions=2.7.7 build.scala.versions=2.7.7
project.initialize=false project.initialize=false

25
sbt/scripted/scala-gc.log Normal file
View File

@ -0,0 +1,25 @@
0.149: [GC 3072K->464K(8896K), 0.0038650 secs]
0.214: [GC 3536K->520K(11968K), 0.0028190 secs]
0.351: [GC 6664K->561K(11968K), 0.0024460 secs]
0.490: [GC 6705K->771K(18112K), 0.0017490 secs]
2.793: [GC 13059K->1316K(18112K), 0.0040220 secs]
3.041: [GC 13604K->2504K(30336K), 0.0041560 secs]
3.135: [GC 26504K->4369K(30912K), 0.0056870 secs]
3.191: [GC 28369K->6561K(54784K), 0.0027230 secs]
3.194: [Full GC 6561K->6552K(60288K), 0.0423330 secs]
3.308: [GC 52287K->11365K(61312K), 0.0062710 secs]
3.556: [GC 58341K->16760K(82816K), 0.0078280 secs]
3.564: [Full GC 16760K->16747K(92800K), 0.0607530 secs]
4.408: [GC 77695K->20678K(95104K), 0.0096950 secs]
4.714: [GC 86406K->22524K(105344K), 0.0063760 secs]
4.721: [Full GC 22524K->22176K(120448K), 0.0837030 secs]
5.224: [GC 97471K->24438K(121408K), 0.0076290 secs]
21.003: [GC 99958K->29538K(129472K), 0.0067060 secs]
21.123: [GC 113570K->38290K(130624K), 0.0118530 secs]
21.441: [GC 122322K->44630K(148480K), 0.0111380 secs]
21.452: [Full GC 44630K->21113K(152448K), 0.1224820 secs]
21.743: [GC 118841K->23182K(154816K), 0.0057880 secs]
47.023: [GC 120910K->29717K(163456K), 0.0094350 secs]
47.181: [GC 138517K->40717K(165632K), 0.0171520 secs]
47.377: [GC 149498K->45428K(184192K), 0.0074670 secs]
48.545: [GC 168628K->50367K(187904K), 0.0125090 secs]

2
sbt/scripted/src/main/scala/Scripted.scala
View File

@ -49,7 +49,7 @@ trait Scripted extends Project with MultiTaskProject
def scriptedTest(test: ScriptedTest) = def scriptedTest(test: ScriptedTest) =
task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask) task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask)
val testTasks = tests.map(scriptedTest) val testTasks = tests.map(scriptedTest)
Empty named("scripted-test-complete") dependsOn(testTasks : _*) task {None} named("scripted-test-complete") dependsOn(testTasks : _*)
} }
private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s) private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s)

4
sbt/scripted/src/main/scala/ScriptedTests.scala
View File

@ -13,7 +13,7 @@ import xsbt.test.{CommentHandler, FileCommands, ScriptRunner, TestScriptParser}
final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) extends NotNull final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) extends NotNull
{ {
@deprecated def this(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) = @deprecated def this(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) =
this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level)) = this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level))
private val testResources = new Resources(resourceBaseDirectory) private val testResources = new Resources(resourceBaseDirectory)
@ -87,7 +87,7 @@ object CompatibilityLevel extends Enumeration
object FillProperties object FillProperties
{ {
def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit = def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit =
apply(projectDirectory, sbtVersion, defScalaVersion, defaultVersions(level)) apply(projectDirectory, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level))
def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit = def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit =
{ {
import xsbt.Paths._ import xsbt.Paths._