diff options
author | Marcelo Vanzin <vanzin@cloudera.com> | 2015-09-15 13:03:38 -0700 |
---|---|---|
committer | Marcelo Vanzin <vanzin@cloudera.com> | 2015-09-15 13:03:38 -0700 |
commit | b42059d2efdf3322334694205a6d951bcc291644 (patch) | |
tree | 551ffe50ef6df7b3c0fe1d9b2f66049a8eac9487 /project/SparkBuild.scala | |
parent | 416003b26401894ec712e1a5291a92adfbc5af01 (diff) | |
download | spark-b42059d2efdf3322334694205a6d951bcc291644.tar.gz spark-b42059d2efdf3322334694205a6d951bcc291644.tar.bz2 spark-b42059d2efdf3322334694205a6d951bcc291644.zip |
Revert "[SPARK-10300] [BUILD] [TESTS] Add support for test tags in run-tests.py."
This reverts commit 8abef21dac1a6538c4e4e0140323b83d804d602b.
Diffstat (limited to 'project/SparkBuild.scala')
-rw-r--r-- | project/SparkBuild.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d80d300f1c..901cfa538d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -567,20 +567,11 @@ object TestSettings { javaOptions in Test ++= "-Xmx3g -Xss4096k -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g" .split(" ").toSeq, javaOptions += "-Xmx3g", - // Exclude tags defined in a system property - testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, - sys.props.get("test.exclude.tags").map { tags => - tags.split(",").flatMap { tag => Seq("-l", tag) }.toSeq - }.getOrElse(Nil): _*), - testOptions in Test += Tests.Argument(TestFrameworks.JUnit, - sys.props.get("test.exclude.tags").map { tags => - Seq("--exclude-categories=" + tags) - }.getOrElse(Nil): _*), // Show full stack trace and duration in test cases. testOptions in Test += Tests.Argument("-oDF"), - testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), + testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), // Enable Junit testing. - libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test", + libraryDependencies += "com.novocode" % "junit-interface" % "0.9" % "test", // Only allow one test at a time, even across projects, since they run in the same JVM parallelExecution in Test := false, // Make sure the test temp directory exists. |