Merge pull request swiftlang#1405 from mattrajca/master

Author: swift-ci

Foundation/FileManager.swift

@@ -150,7 +150,7 @@ open class FileManager : NSObject {
             var isDir: ObjCBool = false
             if !fileExists(atPath: path, isDirectory: &isDir) {
                 let parent = path._nsObject.deletingLastPathComponent
-                if !fileExists(atPath: parent, isDirectory: &isDir) {
+                if !parent.isEmpty && !fileExists(atPath: parent, isDirectory: &isDir) {
                     try createDirectory(atPath: parent, withIntermediateDirectories: true, attributes: attributes)
                 }
                 if mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO) != 0 {

TestFoundation/TestFileManager.swift

@@ -33,6 +33,7 @@ class TestFileManager : XCTestCase {
             ("test_copyItemAtPathToPath", test_copyItemAtPathToPath),
             ("test_homedirectoryForUser", test_homedirectoryForUser),
             ("test_temporaryDirectoryForUser", test_temporaryDirectoryForUser),
+            ("test_creatingDirectoryWithShortIntermediatePath", test_creatingDirectoryWithShortIntermediatePath),
         ]
     }
 
@@ -111,6 +112,20 @@ class TestFileManager : XCTestCase {
         }
     }
 
+    func test_creatingDirectoryWithShortIntermediatePath() {
+        let fileManager = FileManager.default
+        fileManager.changeCurrentDirectoryPath(NSTemporaryDirectory())
+
+        let relativePath = NSUUID().uuidString
+
+        do {
+            try fileManager.createDirectory(atPath: relativePath, withIntermediateDirectories: true, attributes: nil)
+            try fileManager.removeItem(atPath: relativePath)
+        } catch {
+            XCTFail("Failed to create and clean up directory")
+        }
+    }
+
     func test_moveFile() {
         let fm = FileManager.default
         let path = NSTemporaryDirectory() + "testfile\(NSUUID().uuidString)"