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

fix scripted tests/*

This commit is contained in:
Mark Harrah 2012-12-06 12:15:34 -05:00
parent 24be2e5f25
commit 154134adb0
8 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/sbt-test/tests/arguments/build.sbt
View File

@ -1,4 +1,4 @@
libraryDependencies += "org.scalatest" % "scalatest_2.9.1" % "1.6.1" % "test"
libraryDependencies += "org.scalatest" % "scalatest_2.10.0-RC3" % "1.8-B1" % "test"
testOptions in Configurations.Test ++= {

16
sbt/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
View File

@ -1,16 +0,0 @@
import sbt._
class ArgumentTest(info: ProjectInfo) extends DefaultProject(info)
{
val st = "org.scalatest" % "scalatest" % "1.3"
override def testOptions =
super.testOptions ++
args("success1", "-n", "test2 test3") ++
args("success2", "-n", "test2") ++
args("success3", "-n", "test3") ++
args("failure1", "-n", "test1") ++
args("failure2", "-n", "test1 test4") ++
args("failure3", "-n", "test1 test3")
def args(path: Path, args: String*): Seq[TestOption] = if(path.exists) TestArgument(args : _*) :: Nil else Nil
}

5
sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala
View File

@ -13,9 +13,10 @@ object ForkTestsTest extends Build {
def groupPrefix(idx: Int) = groupId(idx) + "_file_"
lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq(
scalaVersion := "2.9.2",
testGrouping <<= definedTests in Test map { tests =>
assert(tests.size == 1)
val groups = Stream const tests(0) take totalFiles grouped groupSize
val groups = Stream continually tests(0) take totalFiles grouped groupSize
for ((ts, idx) <- groups.toSeq.zipWithIndex) yield {
new Group(groupId(idx), ts, SubProcess(Seq("-Dgroup.prefix=" + groupPrefix(idx), "-Dgroup.size=" + ts.size)))
}
@ -31,6 +32,6 @@ object ForkTestsTest extends Build {
}
},
concurrentRestrictions := Tags.limit(Tags.ForkedTestGroup, 2) :: Nil,
libraryDependencies += "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test"
libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test"
))
}

2
sbt/src/sbt-test/tests/it/project/B.scala
View File

@ -12,5 +12,5 @@ object B extends Build
resolvers += ScalaToolsReleases
)
lazy val specs = "org.specs2" % "specs2_2.9.1" % "1.7.1" % "it,test"
lazy val specs = "org.specs2" % "specs2_2.10" % "1.12.3" % "it,test"
}

2
sbt/src/sbt-test/tests/resources/build.sbt
View File

@ -1,3 +1,3 @@
libraryDependencies += "org.specs2" % "specs2_2.9.1" % "1.7.1" % "test"
libraryDependencies += "org.specs2" % "specs2_2.10" % "1.12.3" % "test"
resolvers += ScalaToolsReleases

4
sbt/src/sbt-test/tests/specs-run/build.sbt
View File

@ -1,3 +1,5 @@
libraryDependencies += "org.specs2" % "specs2_2.9.1" % "1.7.1" % "test"
scalaVersion := "2.9.1"
libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test"
resolvers += ScalaToolsReleases

1
sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala
View File

@ -10,6 +10,7 @@ object Ticket543Test extends Build {
lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq(
libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test",
scalaVersion := "2.9.2",
fork := true,
testListeners += new TestReportListener {
def testEvent(event: TestEvent) {

2
sbt/src/sbt-test/tests/test-quick/project/Build.scala
View File

@ -4,7 +4,7 @@ import Defaults._
object B extends Build {
lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq(
libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test" cross(CrossVersion.full),
libraryDependencies += "org.scalatest" %% "scalatest" % "1.8-B1" % "test" cross(CrossVersion.full),
parallelExecution in test := false
))
}