From b9e5d3cadd0f07c211623b045466220c39abdc56 Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Tue, 16 Jun 2015 21:10:18 +0100 Subject: [PATCH] [SPARK-8126] [BUILD] Make sure temp dir exists when running tests. If you ran "clean" at the top-level sbt project, the temp dir would go away, so running "test" without restarting sbt would fail. This fixes that by making sure the temp dir exists before running tests. Author: Marcelo Vanzin Closes #6805 from vanzin/SPARK-8126-fix and squashes the following commits: 12d7768 [Marcelo Vanzin] [SPARK-8126] [build] Make sure temp dir exists when running tests. (cherry picked from commit cebf2411847706a98dc8df9c754ef53d6d12a87c) Signed-off-by: Sean Owen --- project/SparkBuild.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 0b82a02a05..bd0cf33044 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -53,9 +53,6 @@ object BuildCommons { val sparkHome = buildLocation val testTempDir = s"$sparkHome/target/tmp" - if (!new File(testTempDir).isDirectory()) { - require(new File(testTempDir).mkdirs()) - } } object SparkBuild extends PomBuild { @@ -534,6 +531,13 @@ object TestSettings { 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. + resourceGenerators in Test <+= resourceManaged in Test map { outDir: File => + if (!new File(testTempDir).isDirectory()) { + require(new File(testTempDir).mkdirs()) + } + Seq[File]() + }, concurrentRestrictions in Global += Tags.limit(Tags.Test, 1), // Remove certain packages from Scaladoc scalacOptions in (Compile, doc) := Seq(