   // ASCII cases
   ComparisonTest(.LT, "t", "tt"),
   ComparisonTest(.GT, "t", "Tt",
-    xfail: .Custom({ objCPresent == false },
-      reason: "Compares in reverse with ICU, https://bugs.swift.org/browse/SR-530")),
+    xfail: .NativeRuntime(
+      "Compares in reverse with ICU, https://bugs.swift.org/browse/SR-530")),
   ComparisonTest(.GT, "\u{0}", "",
-    xfail: .Custom({ objCPresent == false },
-      reason: "Null-related issue: https://bugs.swift.org/browse/SR-630")),
+    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"),

  // U+0341 has a canonical decomposition mapping of U+0301.
  ComparisonTest(.EQ, "\u{0301}", "\u{0341}"),
  ComparisonTest(.LT, "\u{0301}", "\u{0954}",
    xfail: .Custom({ objCPresent == false },
      reason: "Compares as equal with ICU")),
  ComparisonTest(.LT, "\u{0341}", "\u{0954}",
    xfail: .Custom({ objCPresent == false },
      reason: "Compares as equal with ICU")),
]

func checkStringComparison(

}

StringTests.test("hasPrefix,hasSuffix")
  .skip(.NativeRuntime(
    "String.has{Prefix,Suffix} defined when _runtime(_ObjC)"))
  .code {
  for test in comparisonTests {
    checkHasPrefixHasSuffix(test.lhs, test.rhs, test.loc.withCurrentLoc())
