commit 6d862d694b4ea6f14ac5ffea0c094acc7a7010e2
author swift-ci <swift-ci@users.noreply.github.com> Thu Oct 12 06:17:01 2017 -0700
committer GitHub <noreply@github.com> Thu Oct 12 06:17:01 2017 -0700
tree b229774eb2d9e8b3379d64a90fe661b2a2fd1a90
parent 57fb8d2184d1fdcdcd46dcb151fb3babaa28f82a
parent 5e392a400c00a1c4743ae1dd8688e3f0853863e5

Merge pull request #1261 from spevans/pr_nslocktest_fix

TestFoundation/TestNSLock.swift

diff --git a/TestFoundation/TestNSLock.swift b/TestFoundation/TestNSLock.swift
index 9191ade..0b5ef46 100644
--- a/TestFoundation/TestNSLock.swift
+++ b/TestFoundation/TestNSLock.swift
@@ -41,11 +41,14 @@
         }
 
         let thread = Thread() {
+            lock.lock()
+
+            // Now wake up the main thread so it can try to obtain the lock that
+            // this thread just obtained.
             condition.lock()
             condition.signal()
             condition.unlock()
 
-            lock.lock()
             Thread.sleep(forTimeInterval: 8)
             lock.unlock()
         }