summaryrefslogtreecommitdiff
path: root/project/Testing.scala
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2012-06-18 22:26:31 -0400
committerJosh Suereth <joshua.suereth@gmail.com>2012-06-18 22:26:31 -0400
commit82032eb2696c44490d8504059dc95790225f79bf (patch)
tree40526ca882a9d703d46ade0cd62cc8e1eb84a87f /project/Testing.scala
parent48fc0393808408cd974a80d6ca65b33003599e14 (diff)
downloadscala-82032eb2696c44490d8504059dc95790225f79bf.tar.gz
scala-82032eb2696c44490d8504059dc95790225f79bf.tar.bz2
scala-82032eb2696c44490d8504059dc95790225f79bf.zip
Final clean up to get the build/testing working again.
Diffstat (limited to 'project/Testing.scala')
-rw-r--r--project/Testing.scala7
1 files changed, 2 insertions, 5 deletions
diff --git a/project/Testing.scala b/project/Testing.scala
index 61676c81bd..cec1d8c60b 100644
--- a/project/Testing.scala
+++ b/project/Testing.scala
@@ -7,9 +7,6 @@ import ScalaBuildKeys._
/** All settings/projects relating to testing. */
trait Testing { self: ScalaBuild.type =>
- /* lazy val scalacheckSettings: Seq[Setting[_]] = Seq(fullQuickScalaReference, crossPaths := false)*/
- lazy val scalacheck = uri("git://github.com/jsuereth/scalacheck.git#scala-build")
-
lazy val testsuiteSettings: Seq[Setting[_]] = compilerDependentProjectSettings ++ partestTaskSettings ++ VerifyClassLoad.settings ++ Seq(
unmanagedBase <<= baseDirectory / "test/files/lib",
fullClasspath in VerifyClassLoad.checkClassLoad <<= (fullClasspath in scalaLibrary in Runtime).identity,
@@ -32,12 +29,12 @@ trait Testing { self: ScalaBuild.type =>
val testsuite = (
Project("testsuite", file("."))
settings (testsuiteSettings:_*)
- dependsOn (scalaLibrary, scalaCompiler, fjbg, partest, scalacheck)
+ dependsOn (scalaLibrary, scalaCompiler, fjbg, partest, scalacheck, actorsMigration)
)
val continuationsTestsuite = (
Project("continuations-testsuite", file("."))
settings (continuationsTestsuiteSettings:_*)
- dependsOn (partest, scalaLibrary, scalaCompiler, fjbg)
+ dependsOn (partest, scalaLibrary, scalaCompiler, fjbg, actorsMigration)
)
}