[libcxx] r300451 - Sigh. Once again forgot about the 'no exceptions' bots.

Marshall Clow via cfe-commits cfe-commits at lists.llvm.org
Mon Apr 17 07:18:44 PDT 2017


Author: marshall
Date: Mon Apr 17 09:18:44 2017
New Revision: 300451

URL: http://llvm.org/viewvc/llvm-project?rev=300451&view=rev
Log:
Sigh. Once again forgot about the 'no exceptions' bots.

Modified:
    libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
    libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp

Modified: libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp?rev=300451&r1=300450&r2=300451&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp Mon Apr 17 09:18:44 2017
@@ -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
 }

Modified: libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp?rev=300451&r1=300450&r2=300451&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp Mon Apr 17 09:18:44 2017
@@ -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
 }




More information about the cfe-commits mailing list