Simply debug mode tests per Dmitri Gribenko's suggestion.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@178026 91177308-0d34-0410-b5e6-96231b3b80d8

test/containers/sequences/vector/db_back.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_cback.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     const C c;

test/containers/sequences/vector/db_cfront.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     const C c;

test/containers/sequences/vector/db_cindex.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     const C c(1);

test/containers/sequences/vector/db_front.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_index.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_iterators_1.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c1;

test/containers/sequences/vector/db_iterators_2.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c1;

test/containers/sequences/vector/db_iterators_3.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c1;

test/containers/sequences/vector/db_iterators_4.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_iterators_5.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_iterators_6.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_iterators_7.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/db_iterators_8.pass.cpp

@@ -13,7 +13,7 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
@@ -21,14 +21,8 @@
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     typedef int T;
     typedef std::vector<T> C;
     C c(1);

test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp

@@ -13,21 +13,15 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
 #include <cstdlib>
 #include <exception>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     int a1[] = {1, 2, 3};
     std::vector<int> l1(a1, a1+3);
     std::vector<int>::const_iterator i = l1.end();

test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp

@@ -13,21 +13,15 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
 #include <cstdlib>
 #include <exception>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     int a1[] = {1, 2, 3};
     std::vector<int> l1(a1, a1+3);
     std::vector<int> l2(a1, a1+3);

test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp

@@ -13,21 +13,15 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     int a1[] = {1, 2, 3};
     std::vector<int> l1(a1, a1+3);
     std::vector<int> l2(a1, a1+3);

test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp

@@ -13,21 +13,15 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     int a1[] = {1, 2, 3};
     std::vector<int> l1(a1, a1+3);
     std::vector<int> l2(a1, a1+3);

test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp

@@ -13,21 +13,15 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     int a1[] = {1, 2, 3};
     std::vector<int> l1(a1, a1+3);
     std::vector<int> l2(a1, a1+3);

test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp

@@ -13,21 +13,15 @@
 
 #if _LIBCPP_DEBUG2 >= 1
 
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 
 #include <vector>
 #include <cassert>
 #include <exception>
 #include <cstdlib>
 
-void f1()
-{
-    std::exit(0);
-}
-
 int main()
 {
-    std::set_terminate(f1);
     int a1[] = {1, 2, 3};
     std::vector<int> l1(a1, a1+3);
     std::vector<int>::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());

test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp

@@ -12,7 +12,7 @@
 // void pop_back();
 
 #if _LIBCPP_DEBUG2 >= 1
-#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate())
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
 #endif
 
 #include <vector>
@@ -23,17 +23,10 @@
 #include <cstdlib>
 #include <exception>
 
-void f1()
-{
-    std::exit(0);
-}
 #endif
 
 int main()
 {
-#if _LIBCPP_DEBUG2 >= 1
-    std::set_terminate(f1);
-#endif
     {
         std::vector<int> c;
         c.push_back(1);