Fix some string_view tests that were failing when exceptions were disabled. Also comment out a _LIBCPP_ASSERT that gcc4.9 was complaining about. Will revisit that later.

llvm-svn: 276241

1 files changed, 11 insertions, 6 deletions

diff --git a/libcxx/test/std/strings/string.view/string.view.ops/substr.pass.cpp b/libcxx/test/std/strings/string.view/string.view.ops/substr.pass.cpp
index afba3a64486..88a093ad8b9 100644
--- a/libcxx/test/std/strings/string.view/string.view.ops/substr.pass.cpp
+++ b/libcxx/test/std/strings/string.view/string.view.ops/substr.pass.cpp
@@ -22,16 +22,21 @@
 
 template<typename CharT>
 void test1(std::basic_string_view<CharT> sv, size_t n, size_t pos) {
-	try {
-		std::basic_string_view<CharT> sv1 = sv.substr(pos, n);
+#ifdef TEST_HAS_NO_EXCEPTIONS
+    if (pos <= sv.size())
+        assert (sign( sv1.compare(pos1, n1, sv2)) == sign(expected));
+#else
+    try {
+        std::basic_string_view<CharT> sv1 = sv.substr(pos, n);
         const size_t rlen = std::min(n, sv.size() - pos);
         assert (sv1.size() == rlen);
         for (size_t i = 0; i <= rlen; ++i)
             assert(sv[pos+i] == sv1[i]);
-	}
-	catch (const std::out_of_range&) {
-		assert(pos > sv.size());
-	}
+    }
+    catch (const std::out_of_range&) {
+        assert(pos > sv.size());
+    }
+#endif
 }