diff --git a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp index 591782b5dd4a..f039ced7c7a0 100644 --- a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp +++ b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // - +// XFAIL: libcpp-no-exceptions // // __libcpp_is_trivial_iterator diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp index d0e34597d431..36daadf839fe 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp @@ -27,6 +27,7 @@ test(S s, It first, It last, S expected) assert(s == expected); } +#ifndef TEST_HAS_NO_EXCEPTIONS template void test_exceptions(S s, It first, It last) @@ -40,6 +41,7 @@ test_exceptions(S s, It first, It last) assert(s.__invariants()); assert(s == aCopy); } +#endif int main() { diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp index de43b408f140..1d138531154b 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp @@ -27,6 +27,7 @@ test(S s, It first, It last, S expected) assert(s == expected); } +#ifndef TEST_HAS_NO_EXCEPTIONS template void test_exceptions(S s, It first, It last) @@ -40,6 +41,7 @@ test_exceptions(S s, It first, It last) assert(s.__invariants()); assert(s == aCopy); } +#endif int main() { diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index 3128569f9572..c4529c797438 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -33,6 +33,7 @@ test(S s, typename S::difference_type pos, It first, It last, S expected) assert(s == expected); } +#ifndef TEST_HAS_NO_EXCEPTIONS template void test_exceptions(S s, typename S::difference_type pos, It first, It last) @@ -47,6 +48,7 @@ test_exceptions(S s, typename S::difference_type pos, It first, It last) assert(s.__invariants()); assert(s == aCopy); } +#endif int main() { diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp index 60f2e3fe6d0b..70c713b4f903 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp @@ -35,6 +35,7 @@ test(S s, typename S::size_type pos1, typename S::size_type n1, It f, It l, S ex assert(s.size() == old_size - xlen + rlen); } +#ifndef TEST_HAS_NO_EXCEPTIONS template void test_exceptions(S s, typename S::size_type pos1, typename S::size_type n1, It f, It l) @@ -50,6 +51,7 @@ test_exceptions(S s, typename S::size_type pos1, typename S::size_type n1, It f, assert(s.__invariants()); assert(s == aCopy); } +#endif const char* str = "12345678901234567890";