diff options
Diffstat (limited to 'libcxx/test')
21 files changed, 21 insertions, 148 deletions
diff --git a/libcxx/test/containers/sequences/vector/db_back.pass.cpp b/libcxx/test/containers/sequences/vector/db_back.pass.cpp index c6115fa4cc4..b28af8b2607 100644 --- a/libcxx/test/containers/sequences/vector/db_back.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp index 193f5ec7932..18f0630791b 100644 --- a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp +++ b/libcxx/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; diff --git a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp index 162760baa35..9712a39863a 100644 --- a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp +++ b/libcxx/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; diff --git a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp index 5fef131ed1c..ad330433594 100644 --- a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_front.pass.cpp b/libcxx/test/containers/sequences/vector/db_front.pass.cpp index 04f9286279b..4892e285877 100644 --- a/libcxx/test/containers/sequences/vector/db_front.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_index.pass.cpp b/libcxx/test/containers/sequences/vector/db_index.pass.cpp index e906decc796..05b0bc48c56 100644 --- a/libcxx/test/containers/sequences/vector/db_index.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_iterators_1.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_1.pass.cpp index 57c13d42eae..fbcb40f614d 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_1.pass.cpp +++ b/libcxx/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; diff --git a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp index 3939517ebba..616ee5bb7e8 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp +++ b/libcxx/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; diff --git a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp index 7e14f357160..1ef27cf5308 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp +++ b/libcxx/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; diff --git a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp index 81c6187b79a..4d60bd9b8f6 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp index 85b07cdd2ed..bb3bf059bfc 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp index 25e19c61dad..24db88d4f64 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp index 5c2d15897be..709af3a852a 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp index 79e7ccc4c47..178240aa8a4 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp index 29669342521..81f1354bb53 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/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(); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp index f67ddb4aa1c..15fa5a39c2c 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp index 11395baa627..846e111f8db 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp index 202fef4aeef..04cb5dc7d85 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp index 6df60bdbbf2..a614a11dd55 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/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); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp index a8bc2be64b5..9818024b1cb 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/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()); diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp index ac6ee04bc29..abfefb0dd85 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp +++ b/libcxx/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); |
