From 1ecba09e20ea283f9ba0c76bd3d2c18f857c83d2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 18 Nov 2004 19:11:41 +0000 Subject: [PATCH] sum_diff.cc: Use VERIFY. 2004-11-18 Paolo Carlini * testsuite/26_numerics/numeric/sum_diff.cc: Use VERIFY. * testsuite/ext/array_allocator/1.cc: Likewise. * testsuite/ext/array_allocator/2.cc: Likewise. * testsuite/ext/array_allocator/3.cc: Likewise. * testsuite/ext/enc_filebuf/char/13598.cc: Likewise. From-SVN: r90878 --- libstdc++-v3/ChangeLog | 8 ++++++++ .../testsuite/26_numerics/numeric/sum_diff.cc | 16 +++++++++------- libstdc++-v3/testsuite/ext/array_allocator/1.cc | 8 +++++--- libstdc++-v3/testsuite/ext/array_allocator/2.cc | 8 +++++--- libstdc++-v3/testsuite/ext/array_allocator/3.cc | 8 +++++--- .../testsuite/ext/enc_filebuf/char/13598.cc | 9 +++++---- 6 files changed, 37 insertions(+), 20 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 09e20fc97815..638c420e0c98 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2004-11-18 Paolo Carlini + + * testsuite/26_numerics/numeric/sum_diff.cc: Use VERIFY. + * testsuite/ext/array_allocator/1.cc: Likewise. + * testsuite/ext/array_allocator/2.cc: Likewise. + * testsuite/ext/array_allocator/3.cc: Likewise. + * testsuite/ext/enc_filebuf/char/13598.cc: Likewise. + 2004-11-18 Paolo Carlini * include/bits/locale_facets.tcc (num_get<>::do_get(void*&)): diff --git a/libstdc++-v3/testsuite/26_numerics/numeric/sum_diff.cc b/libstdc++-v3/testsuite/26_numerics/numeric/sum_diff.cc index 9a4cf68c1d5b..64690be500b1 100644 --- a/libstdc++-v3/testsuite/26_numerics/numeric/sum_diff.cc +++ b/libstdc++-v3/testsuite/26_numerics/numeric/sum_diff.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -21,7 +21,7 @@ #include #include -#include +#include int A[] = {1, 4, 9, 16, 25, 36, 49, 64, 81, 100}; int B[] = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19}; @@ -30,13 +30,15 @@ const int N = sizeof(A) / sizeof(int); void test01() { - int D[N]; + bool test __attribute__((unused)) = true; - std::adjacent_difference(A, A + N, D); - assert(std::equal(D, D + N, B)); + int D[N]; - std::partial_sum(D, D + N, D); - assert(std::equal(D, D + N, A)); + std::adjacent_difference(A, A + N, D); + VERIFY( std::equal(D, D + N, B) ); + + std::partial_sum(D, D + N, D); + VERIFY( std::equal(D, D + N, A) ); } int diff --git a/libstdc++-v3/testsuite/ext/array_allocator/1.cc b/libstdc++-v3/testsuite/ext/array_allocator/1.cc index 68cbc73f3f7a..e0ea6f5ab133 100644 --- a/libstdc++-v3/testsuite/ext/array_allocator/1.cc +++ b/libstdc++-v3/testsuite/ext/array_allocator/1.cc @@ -25,9 +25,9 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include #include #include +#include typedef char char_type; typedef std::char_traits traits_type; @@ -37,6 +37,8 @@ array_type extern_array; void test01() { + bool test __attribute__((unused)) = true; + using std::basic_string; typedef __gnu_cxx::array_allocator allocator_type; typedef basic_string string_type; @@ -50,11 +52,11 @@ void test01() } catch(std::bad_alloc& obj) { - assert(true); + VERIFY( true ); } catch(...) { - assert(false); + VERIFY( false ); } } diff --git a/libstdc++-v3/testsuite/ext/array_allocator/2.cc b/libstdc++-v3/testsuite/ext/array_allocator/2.cc index 9ee2d07d5544..74b2bc9a802c 100644 --- a/libstdc++-v3/testsuite/ext/array_allocator/2.cc +++ b/libstdc++-v3/testsuite/ext/array_allocator/2.cc @@ -25,10 +25,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include #include #include #include +#include typedef char char_type; typedef std::char_traits traits_type; @@ -38,6 +38,8 @@ array_type extern_array; void test01() { + bool test __attribute__((unused)) = true; + using std::basic_string; typedef __gnu_cxx::array_allocator allocator_type; typedef basic_string string_type; @@ -52,11 +54,11 @@ void test01() } catch(std::bad_alloc& obj) { - assert(false); + VERIFY( false ); } catch(...) { - assert(false); + VERIFY( false ); } s.append(1, 'c'); diff --git a/libstdc++-v3/testsuite/ext/array_allocator/3.cc b/libstdc++-v3/testsuite/ext/array_allocator/3.cc index 297b902c8835..97ffbb467c56 100644 --- a/libstdc++-v3/testsuite/ext/array_allocator/3.cc +++ b/libstdc++-v3/testsuite/ext/array_allocator/3.cc @@ -25,9 +25,9 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#include #include #include +#include typedef char char_type; typedef std::char_traits traits_type; @@ -37,6 +37,8 @@ array_type extern_array; void test01() { + bool test __attribute__((unused)) = true; + using std::basic_string; typedef __gnu_cxx::array_allocator allocator_type; typedef basic_string string_type; @@ -51,11 +53,11 @@ void test01() } catch(std::bad_alloc& obj) { - assert(true); + VERIFY( true ); } catch(...) { - assert(false); + VERIFY( false ); } } diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc index a9270e145bbe..70f83e1bda35 100644 --- a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc +++ b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #ifdef _GLIBCXX_USE___ENC_TRAITS #include #endif @@ -26,8 +26,9 @@ int main() { #ifdef _GLIBCXX_USE___ENC_TRAITS - const char* str = "Hello, world!\n"; + bool test __attribute__((unused)) = true; + const char* str = "Hello, world!\n"; std::locale loc(std::locale::classic(), new std::codecvt()); std::__enc_traits st("ISO-8859-1", "ISO-8859-1"); @@ -39,8 +40,8 @@ int main() int s = fb.pubsync(); fb.close(); - assert(n == std::strlen(str)); - assert(s == 0); + VERIFY( n == std::strlen(str) ); + VERIFY( s == 0 ); #endif return 0;