2004-11-27 Paolo Carlini <pcarlini@suse.de>

	* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91368 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index feff7c4..ce9e287 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-27  Paolo Carlini  <pcarlini@suse.de>
+
+       * 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  <pcarlini@suse.de>
 
        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 39071e6..bd7bfbd 100644 (file)
--- 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 f903aab..a5b6846 100644 (file)
--- 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 6b827f1..bfba687 100644 (file)
--- 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 b9f938e..88f48c4 100644 (file)
--- 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 2b25483..a3fe28a 100644 (file)
--- 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::streamsize>(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 5f290ff..c501d83 100644 (file)
--- 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",