commit 81c29c7a80b0852edb80cf251d480a80efff4f43
author Lance Parker <lance_parker@apple.com> Thu Feb 22 15:59:19 2018 -0800
committer Lance Parker <lance_parker@apple.com> Thu Feb 22 15:59:19 2018 -0800
tree ba458ec769876c505c667befd85a73af0548a980
parent e16e682d6136b97f6c0be45f3295fea613b4d689

Fix ambiguous init failure

TestFoundation/TestNSString.swift

diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift
index 651b4be..2d7dcc3 100755
--- a/TestFoundation/TestNSString.swift
+++ b/TestFoundation/TestNSString.swift
@@ -1230,23 +1230,23 @@
     }
 
     init(
-        _ lhs: String, _ rhs: String,
-          expectedFailure reason: String = "", line: UInt = #line
-    ) {
-        self.lhs = lhs
-        self.rhs = rhs
-        self.behavior = reason.isEmpty ? .run : .expectedFailure(reason)
-        self.loc = line
-    }
+      _ lhs: String, _ rhs: String,
+      expectedFailure xfailReason: String = "",
+      skip skipReason: String = "",
+      line: UInt = #line
+      ) {
+      self.lhs = lhs
+      self.rhs = rhs
+      self.loc = line
     
-    init(
-        _ lhs: String, _ rhs: String,
-          skip reason: String = "", line: UInt = #line
-    ) {
-        self.lhs = lhs
-        self.rhs = rhs
-        self.behavior = reason.isEmpty ? .run : .skip(reason)
-        self.loc = line
+      switch (xfailReason.isEmpty, skipReason.isEmpty) {
+      case (false, true):
+        behavior = .expectedFailure(xfailReason)
+      case (_, false):
+        behavior = .skip(skipReason)
+      default:
+        behavior = .run
+      }
     }
 }