From ef68f26b28bfb9fbb771857701c55b8b2cb54847 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 21 Jul 2016 13:18:50 +0000 Subject: Another fix to appease the no-exception bots. llvm-svn: 276272 --- .../string.view/string.view.ops/substr.pass.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'libcxx') 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 88a093ad8b9..7e179ef89d1 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,21 +22,25 @@ template void test1(std::basic_string_view sv, size_t n, size_t pos) { + std::basic_string_view sv1; #ifdef TEST_HAS_NO_EXCEPTIONS - if (pos <= sv.size()) - assert (sign( sv1.compare(pos1, n1, sv2)) == sign(expected)); + if (pos > sv.size()) + return ; // would throw if exceptions were enabled + sv1 = sv.substr(pos, n); #else try { - std::basic_string_view 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]); + sv1 = sv.substr(pos, n); + assert(pos <= sv.size()); } catch (const std::out_of_range&) { assert(pos > sv.size()); + return ; } #endif + 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]); } -- cgit v1.2.3