1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java
index 96d8798c68..32ddf9da9b 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java
@@ -75,9 +75,17 @@ public abstract class TestStrategy implements TestActionContext {
       TestRunnerAction testAction, Path tmpDir, Path coverageDir, Path workingDirectory)
       throws IOException {
     if (isCoverageMode(testAction)) {
-      recreateDirectory(coverageDir);
+      try {
+        recreateDirectory(coverageDir);
+      } catch (IOException e) {
+        throw new IOException("Failed to recreate coverage directory " + coverageDir, e);
+      }
+    }
+    try {
+      recreateDirectory(tmpDir);
+    } catch (IOException e) {
+      throw new IOException("Failed to recreate temporary directory " + tmpDir, e);
     }
-    recreateDirectory(tmpDir);
     FileSystemUtils.createDirectoryAndParents(workingDirectory);
   }