summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-03-14 19:39:30 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-04-17 11:55:52 -0700
commitdbb5274ae1a9f8f2a2aa89c18ca22733478743e7 (patch)
treee007983b4a4c13fab0af09568ec2d410a09bc472 /build.sbt
parentfc2b35a52fc51d6faf8ff07591be991e1c32102a (diff)
downloadscala-dbb5274ae1a9f8f2a2aa89c18ca22733478743e7.tar.gz
scala-dbb5274ae1a9f8f2a2aa89c18ca22733478743e7.tar.bz2
scala-dbb5274ae1a9f8f2a2aa89c18ca22733478743e7.zip
`test` task runs Junit tests
Add dependency on scaladoc in junit subproject, as required by 6e6632e (it introduced a junit test for scaladoc). Enable assertion stack traces and info logging of each test.
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt7
1 files changed, 5 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index 3cf8723dbd..2f2b30147a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -57,6 +57,7 @@ val scalaParserCombinatorsDep = "org.scala-lang.modules" %% "scala-parser-combin
val scalaXmlDep = "org.scala-lang.modules" %% "scala-xml" % versionNumber("scala-xml") exclude("org.scala-lang", "scala-library")
val partestDep = "org.scala-lang.modules" %% "scala-partest" % versionNumber("partest") exclude("org.scala-lang", "scala-library")
val junitDep = "junit" % "junit" % "4.11"
+val junitIntefaceDep = "com.novocode" % "junit-interface" % "0.11" % "test"
val jlineDep = "jline" % "jline" % versionProps("jline.version")
val antDep = "org.apache.ant" % "ant" % "1.9.4"
@@ -217,13 +218,15 @@ lazy val partestExtras = configureAsSubproject(Project("partest-extras", file(".
)
lazy val junit = project.in(file("test") / "junit")
- .dependsOn(library, reflect, compiler, partestExtras)
+ .dependsOn(library, reflect, compiler, partestExtras, scaladoc)
.settings(clearSourceAndResourceDirectories: _*)
.settings(commonSettings: _*)
.settings(
scalaVersion := bootstrapScalaVersion,
ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) },
- libraryDependencies += junitDep,
+ fork in Test := true,
+ libraryDependencies ++= Seq(junitDep, junitIntefaceDep),
+ testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
unmanagedSourceDirectories in Test := List(baseDirectory.value)
)