From 82032eb2696c44490d8504059dc95790225f79bf Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Mon, 18 Jun 2012 22:26:31 -0400 Subject: Final clean up to get the build/testing working again. --- project/Testing.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'project/Testing.scala') 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) ) } -- cgit v1.2.3