From fcfbdb74da074a4f5cbe0729db5437b11870c32e Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 27 Nov 2004 09:34:06 +0000 Subject: [PATCH] 2.cc: Fix typo. 2004-11-27 Paolo Carlini * testsuite/27_io/basic_istream/getline/wchar_t/2.cc: Fix typo. * testsuite/27_io/basic_istream/getline/wchar_t/4.cc: Likewise. * testsuite/22_locale/time_put/put/char/17038.cc: Use VERIFY. * testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise. * testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc: Likewise. * testsuite/27_io/basic_ios/exceptions/char/2.cc: Likewise. From-SVN: r91368 --- libstdc++-v3/ChangeLog | 10 ++++++++++ .../testsuite/22_locale/time_put/put/char/17038.cc | 2 +- .../testsuite/22_locale/time_put/put/wchar_t/17038.cc | 2 +- .../27_io/basic_filebuf/underflow/wchar_t/11603.cc | 4 ++-- .../testsuite/27_io/basic_ios/exceptions/char/2.cc | 6 +++--- .../testsuite/27_io/basic_istream/getline/wchar_t/2.cc | 2 +- .../testsuite/27_io/basic_istream/getline/wchar_t/4.cc | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index feff7c4a28f..ce9e287e681 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2004-11-27 Paolo Carlini + + * testsuite/27_io/basic_istream/getline/wchar_t/2.cc: Fix typo. + * testsuite/27_io/basic_istream/getline/wchar_t/4.cc: Likewise. + + * testsuite/22_locale/time_put/put/char/17038.cc: Use VERIFY. + * testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise. + * testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc: Likewise. + * testsuite/27_io/basic_ios/exceptions/char/2.cc: Likewise. + 2004-11-26 Paolo Carlini DR 243. get and getline when sentry reports failure [WP] diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc index 39071e6ae71..bd7bfbd4eb1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc @@ -38,7 +38,7 @@ void test01() // basic construction locale loc_c = locale::classic(); locale loc_in = __gnu_test::try_named_locale("ta_IN"); - assert( loc_in != loc_c ); + VERIFY( loc_in != loc_c ); // create an ostream-derived object, cache the time_put facet ostringstream oss; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc index f903aab5d21..a5b684643bd 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc @@ -38,7 +38,7 @@ void test01() // basic construction locale loc_c = locale::classic(); locale loc_in = __gnu_test::try_named_locale("ta_IN"); - assert( loc_in != loc_c ); + VERIFY( loc_in != loc_c ); // create an ostream-derived object, cache the time_put facet wostringstream oss; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc index 6b827f15b6e..bfba687bc5b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 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 @@ -177,7 +177,7 @@ void test01() Buf fb; fb.pubimbue(loc); fb.open("tmp_11603", ios_base::in); - assert(fb.pub_showmanyc() == 1); + VERIFY( fb.pub_showmanyc() == 1 ); try { diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/2.cc index b9f938e7559..88f48c4f09d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 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 @@ -39,7 +39,7 @@ int main() { stream.setstate(ios_base::failbit); stream.exceptions(ios_base::failbit); - assert(false); + VERIFY( false ); } catch (...) { @@ -50,7 +50,7 @@ int main() { // Calls clear(rdstate()), which throws in this case. stream.setstate(ios_base::goodbit); - assert(false); + VERIFY( false ); } catch (...) { } diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc index 2b25483ca45..a3fe28adef2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc @@ -83,7 +83,7 @@ L"aaaaaaaaaaaaaa\n"; // delimiter was read. // // -> wcslen(__s) < n - 1 - // -> delimiter was seen -> gcount() > strlen(__s) + // -> delimiter was seen -> gcount() > wcslen(__s) VERIFY( ifs.gcount() == static_cast(std::wcslen(tmp) + 1) ); continue; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc index 5f290ffdb43..c501d8353d1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc @@ -81,7 +81,7 @@ void test01() VERIFY( is.gcount() == 10 ); is.clear(); - traits_type::assign(buffer, sizeof(buffer) / sizeof(wchar_t), 'X'); + traits_type::assign(buffer, sizeof(buffer) / sizeof(wchar_t), L'X'); is.getline(buffer, sizeof(buffer) / sizeof(wchar_t)); VERIFY( is.rdstate() == ios_base::failbit ); VERIFY( !traits_type::compare(buffer, L"abcdefghi\0",