 }
 
 StringTests.test("hasPrefix,hasSuffix")
-  .skip(.Custom({ objCPresent == false },
-      reason: "String.has{Prefix,Suffix} defined when _runtime(_ObjC)"))
+  .skip(.NativeRuntime(
+    "String.has{Prefix,Suffix} defined when _runtime(_ObjC)"))
   .code {
   for test in comparisonTests {
     checkHasPrefixHasSuffix(test.lhs, test.rhs, test.loc.withCurrentLoc())

#endif

var StringTests = TestSuite("StringTests")

var objCPresent: Bool {
#if _runtime(_ObjC)
  return true
#else
  return false
#endif
}

struct ComparisonTest {
  let expectedUnicodeCollation: ExpectedComparisonResult

  // 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"),
