From 2ced039be70559e0254f92ced31573c411a4abdd Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Wed, 15 Jan 2020 13:27:28 -0800
Subject: [PATCH] Revert "TestFoundation: change CWD to TMPDIR and restore
 previous CWD when test finishes"

---
 TestFoundation/TestURL.swift | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/TestFoundation/TestURL.swift b/TestFoundation/TestURL.swift
index 2ae13c477c..3477262b7c 100644
--- a/TestFoundation/TestURL.swift
+++ b/TestFoundation/TestURL.swift
@@ -286,7 +286,6 @@ class TestURL : XCTestCase {
     static var gBaseCurrentWorkingDirectoryPath : String {
         return FileManager.default.currentDirectoryPath
     }
-    static var gSavedPath = ""
     static var gRelativeOffsetFromBaseCurrentWorkingDirectory: UInt = 0
     static let gFileExistsName = "TestCFURL_file_exists\(ProcessInfo.processInfo.globallyUniqueString)"
     static let gFileDoesNotExistName = "TestCFURL_file_does_not_exist"
@@ -340,8 +339,9 @@ class TestURL : XCTestCase {
             }
         }
 
-        TestURL.gSavedPath = FileManager.default.currentDirectoryPath
-        FileManager.default.changeCurrentDirectoryPath(NSTemporaryDirectory())
+        #if os(Android)
+        FileManager.default.changeCurrentDirectoryPath("/data/local/tmp")
+        #endif
 
         let cwd = FileManager.default.currentDirectoryPath
         let cwdURL = URL(fileURLWithPath: cwd, isDirectory: true)
@@ -358,7 +358,6 @@ class TestURL : XCTestCase {
             let error = strerror(errno)!
             XCTFail("Failed to set up test paths: \(String(cString: error))")
         }
-        defer { FileManager.default.changeCurrentDirectoryPath(TestURL.gSavedPath) }
         
         // test with file that exists
         var path = TestURL.gFileExistsPath
@@ -404,7 +403,6 @@ class TestURL : XCTestCase {
             let error = strerror(errno)!
             XCTFail("Failed to set up test paths: \(String(cString: error))")
         }
-        defer { FileManager.default.changeCurrentDirectoryPath(TestURL.gSavedPath) }
         
         // test with file that exists
         var path = TestURL.gFileExistsPath