From 473a1692abf4d64e5df81cd19be214fe5bfa06ec Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Fri, 19 Jul 2013 17:33:17 -0700 Subject: Move partest to https://github.com/scala/scala-partest As partest is now resolved from maven, `test/partest` uses `ant test.suite.init` to determine the classpath (serialized to build/pack/partest.properties) that's necessary to run `scala.tools.partest.nest.ConsoleRunner`. Thus, partest gets exactly the same classpath, whether run from the command line through `test/partest` or via `ant test`. The version of partest we're using is specified by properties defined in versions.properties (formerly `starr.number`). Currently, we're using: ``` scala.binary.version=2.11.0-M4 partest.version.number=1.0-RC3 ``` NOTES: - The version of Scala being tested must be backwards binary compatible with the version of Scala that was used to compile partest. - Once 2.11 goes final, `scala.binary.version=2.11`, and `starr.version=2.11.0`. - Need scalacheck on classpath for test/partest scalacheck tests. - Removed atrophied ant tests (haven't been run/changed for at least two years I checked 81d659141a as a "random" sample). - Removed scalacheck. It's resolved as a partest dependency. - For now, use a locally built scalap - Kept the trace macro in the main repo (partest-extras) - New targets for faster pr validation: test-core-opt, test-stab-opt - Reused partest eclipse/intellij project to partest-extras (note: the partest dependency is hard-coded) --- src/build/dbuild-meta-json-gen.scala | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/build/dbuild-meta-json-gen.scala') diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala index 42214dd191..73eee8ac3a 100644 --- a/src/build/dbuild-meta-json-gen.scala +++ b/src/build/dbuild-meta-json-gen.scala @@ -1,6 +1,6 @@ // use this script to generate dbuild-meta.json // make sure the version is specified correctly, -// update the dependency structura and +// update the dependency structure and // check out distributed-build and run `sbt console`: // TODO: also generate build.xml and eclipse config from a similar data-structure @@ -40,15 +40,6 @@ val meta = Seq(ProjectRef("scala-parser-combinators", "org.scala-lang")), Seq(ProjectRef("scala-library", "org.scala-lang"))), - Project("scalacheck", "org.scala-lang", - Seq(ProjectRef("scalacheck", "org.scala-lang")), - Seq(ProjectRef("scala-library", "org.scala-lang"), ProjectRef("scala-actors", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))), - - Project("scala-partest", "org.scala-lang", - Seq(ProjectRef("scala-partest", "org.scala-lang")), - Seq(ProjectRef("scala-compiler", "org.scala-lang"), // TODO: refine to scala-repl - ProjectRef("scalap", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scalacheck", "org.scala-lang"))), - Project("scaladoc", "org.scala-lang", Seq(ProjectRef("scaladoc", "org.scala-lang")), Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))), -- cgit v1.2.3