 
 StringTests.test("Failures{hasPrefix,hasSuffix}-CF")
   .xfail(.Custom({ true }, reason: "rdar://problem/19034601"))
-  .skip(.Custom({ objCPresent == false },
-    reason: "String.has{Prefix,Suffix} defined when _runtime(_ObjC)"))
+  .skip(.NativeRuntime(
+    "String.has{Prefix,Suffix} defined when _runtime(_ObjC)"))
   .code {
   let test = ComparisonTest(.LT, "\u{0}", "\u{0}\u{0}")
   checkHasPrefixHasSuffix(test.lhs, test.rhs, test.loc.withCurrentLoc())


StringTests.test("Failures{hasPrefix,hasSuffix}")
  .xfail(.Custom({ true }, reason: "blocked on rdar://problem/19036555"))
  .skip(.Custom({ objCPresent == false },
    reason: "String.has{Prefix,Suffix} defined when _runtime(_ObjC)"))
  .code {
  let tests =
    [ComparisonTest(.LT, "\r\n", "t"), ComparisonTest(.GT, "\r\n", "\n")]

  // ASCII cases
  ComparisonTest(.LT, "t", "tt"),
  ComparisonTest(.GT, "t", "Tt",
    xfail: .NativeRuntime(
      "Compares in reverse with ICU, https://bugs.swift.org/browse/SR-530")),
  ComparisonTest(.GT, "\u{0}", "",
    xfail: .NativeRuntime(
      "Null-related issue: https://bugs.swift.org/browse/SR-630")),
  ComparisonTest(.EQ, "\u{0}", "\u{0}"),
  // Currently fails:
  // ComparisonTest(.LT, "\r\n", "t"),
