From: Marshall Clow Date: Mon, 17 Apr 2017 14:18:44 +0000 (+0000) Subject: Sigh. Once again forgot about the 'no exceptions' bots. X-Git-Tag: llvmorg-5.0.0-rc1~7558 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d588b56d9c09daecfb098bf5e276a01f2fb18ec0;p=platform%2Fupstream%2Fllvm.git Sigh. Once again forgot about the 'no exceptions' bots. llvm-svn: 300451 --- diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp index f9d1171..785a5be 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp @@ -18,6 +18,7 @@ #include "min_allocator.h" #include "asan_testing.h" +#ifndef TEST_HAS_NO_EXCEPTIONS struct Throws { Throws() : v_(0) {} Throws(int v) : v_(v) {} @@ -30,6 +31,7 @@ struct Throws { }; bool Throws::sThrows = false; +#endif int main() { @@ -85,6 +87,7 @@ int main() assert(is_contiguous_container_asan_correct(l1)); } #endif +#ifndef TEST_HAS_NO_EXCEPTIONS // Test for LWG2853: // Throws: Nothing unless an exception is thrown by the assignment operator or move assignment operator of T. { @@ -96,4 +99,5 @@ int main() v.erase(v.begin()); assert(v.size() == 0); } +#endif } diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp index 48f61dd..2fc4981 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp @@ -18,6 +18,7 @@ #include "min_allocator.h" #include "asan_testing.h" +#ifndef TEST_HAS_NO_EXCEPTIONS struct Throws { Throws() : v_(0) {} Throws(int v) : v_(v) {} @@ -30,6 +31,7 @@ struct Throws { }; bool Throws::sThrows = false; +#endif int main() { @@ -138,6 +140,7 @@ int main() assert(is_contiguous_container_asan_correct(outer[1])); } #endif +#ifndef TEST_HAS_NO_EXCEPTIONS // Test for LWG2853: // Throws: Nothing unless an exception is thrown by the assignment operator or move assignment operator of T. { @@ -149,4 +152,5 @@ int main() v.erase(v.begin(), v.end()); assert(v.size() == 0); } +#endif }