Merge remote-tracking branch 'origin/master' into master-next

test/swift_test.py

@@ -31,6 +31,20 @@ class SwiftTest(lit.formats.ShTest, object):
         self.skipped_tests = set()
 
     def before_test(self, test, litConfig):
+        _, tmp_base = lit.TestRunner.getTempPaths(test)
+        
+        # Apparently despite the docs, tmpDir is not actually unique for each test, but
+        # tmpBase is.  Remove it here and add a tmpBase substitution in before_test.
+        # Speculative fix for rdar://32928464.
+        try:
+            percentT_index = [x[0] for x in test.config.substitutions].index('%T')
+        except ValueError: pass
+        else:
+            test.config.substitutions.pop(percentT_index)
+
+            test.config.substitutions.append(
+                ('%T', '$(mkdir -p %r && echo %r)' % (tmp_base, tmp_base)))
+
         if self.coverage_mode:
             # FIXME: The compiler crashers run so fast they fill up the
             # merger's queue (and therefore the build bot's disk)
@@ -39,7 +53,6 @@ class SwiftTest(lit.formats.ShTest, object):
                 self.skipped_tests.add(test.getSourcePath())
                 return
 
-            _, tmp_base = lit.TestRunner.getTempPaths(test)
             if self.coverage_mode == "NOT_MERGED":
                 profdir = tmp_base + '.profdir'
                 if not os.path.exists(profdir):