From 277e81345a74ff4c2e83e9c13e411a0b7238be2c Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Sat, 6 Feb 2016 13:38:57 +1000 Subject: [PATCH 1/2] Make scalaXmlVersion logic friendly to future 2.12 releases Otherwise, we'll fall back to the non-existent scala-xml 1.0.4 when bootstrapping the modules with new releases of Scala 2.12. --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index a8d4083..8d6967a 100644 --- a/build.sbt +++ b/build.sbt @@ -13,13 +13,13 @@ crossScalaVersions := { if (java.startsWith("1.6.")) Seq("2.11.7", "2.12.0-M1") else if (java.startsWith("1.8.")) - Seq("2.12.0-M2", "2.12.0-M3") + Seq("2.12.0-M3") else sys.error(s"don't know what Scala versions to build on $java") } scalaXmlVersion := { - if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4" + if(scalaVersion.value.startsWith("2.11.") || scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5" } scalaCheckVersion := "1.11.6" From d762fef617321e73bfe24e7f73c5b1980ceb6c63 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Sat, 6 Feb 2016 13:40:41 +1000 Subject: [PATCH 2/2] Honour --srcpath through the SBT runner Currently, only tests based in `test/files/...` can be tested in partest through SBT. This commit will honour `--srcpath scaladoc`, for example, before defaulting to `files`. --- src/main/scala/scala/tools/partest/nest/SBTRunner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/scala/tools/partest/nest/SBTRunner.scala b/src/main/scala/scala/tools/partest/nest/SBTRunner.scala index 46006e1..acc956f 100644 --- a/src/main/scala/scala/tools/partest/nest/SBTRunner.scala +++ b/src/main/scala/scala/tools/partest/nest/SBTRunner.scala @@ -36,7 +36,7 @@ class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, log } override val suiteRunner = new SuiteRunner( - testSourcePath = Option(srcDir) getOrElse PartestDefaults.sourcePath, + testSourcePath = optSourcePath orElse Option(srcDir) getOrElse PartestDefaults.sourcePath, new FileManager(testClassLoader = testClassLoader), updateCheck = optUpdateCheck, failed = optFailed,