Merge to upstream r231255.

Change-Id: Ia8ee1801b42943464b99f28b6a83647458f3efb5

4 files changed, 4 insertions, 5 deletions

diff --git a/test/std/experimental/string.view/string.view.access/at.pass.cpp b/test/std/experimental/string.view/string.view.access/at.pass.cpp
index 0030afa5d..3003ea835 100644
--- a/test/std/experimental/string.view/string.view.access/at.pass.cpp
+++ b/test/std/experimental/string.view/string.view.access/at.pass.cpp
@@ -9,7 +9,7 @@
 
 // NOTE: Older versions of clang have a bug where they fail to evalute
 // string_view::at as a constant expression.
-// XFAIL: apple-clang-6.0, clang-3.4, clang-3.3
+// XFAIL: clang-3.4, clang-3.3
 
 // <string_view>
 
diff --git a/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp b/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
index 64000d6ed..29f5064d8 100644
--- a/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
+++ b/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
@@ -33,8 +33,8 @@ void test ( const CharT *s ) {
     string_view_t sv1;
     string_t      str = (string_t) sv1;
 
+    assert ( sv1.size() ==  0);
     assert ( sv1.size() == str.size ());
-    assert ( std::char_traits<CharT>::compare ( sv1.data(), str.data(), sv1.size()) == 0 );
     }
 }
 
diff --git a/test/std/experimental/string.view/string.view.ops/substr.pass.cpp b/test/std/experimental/string.view/string.view.ops/substr.pass.cpp
index 2b134ea2c..123646240 100644
--- a/test/std/experimental/string.view/string.view.ops/substr.pass.cpp
+++ b/test/std/experimental/string.view/string.view.ops/substr.pass.cpp
@@ -104,4 +104,4 @@ int main () {
     }
     }
 #endif
-}
\ No newline at end of file
+}
diff --git a/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp b/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
index 6387ac222..a180ab257 100644
--- a/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
+++ b/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
@@ -41,13 +41,12 @@ void test ( const CharT *s ) {
     const std::experimental::basic_string_view<CharT> sv1;
     String                                            str1 = (String) sv1;
 
+    assert ( sv1.size() == 0);
     assert ( sv1.size() == str1.size ());
-    assert ( std::char_traits<CharT>::compare ( sv1.data(), str1.data(), sv1.size()) == 0 );
 
 #if __cplusplus >= 201103L
     auto str2 = sv1.to_string(min_allocator<CharT>());
     assert ( sv1.size() == str2.size ());
-    assert ( std::char_traits<CharT>::compare ( sv1.data(), str2.data(), sv1.size()) == 0 );
 #endif
     }
 }