Testsuite corrections

From-SVN: r68288

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8f24748ee8f9173cd1eb0659e70c01fa0b80795c..c9383a5eb9eb1e061237fc997cf50135ec5f99bc 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,22 @@
+2003-06-20  Doug Gregor <dgregor@apple.com>
+
+        * testsuite/20_util/auto_ptr.cc: don't dereference NULL auto_ptr
+        * testsuite/21_strings/basic_string/replace/char/4.cc: don't 
+            dereference end iterator.
+        * testsuite/21_strings/basic_string/replace/wchar_t/4.cc: same.
+        * testsuite/22_locale/ctype/narrow/char/1.cc: don't subscript with
+            index equal to the length of a string.
+        * testsuite/22_locale/ctype/narrow/char/2.cc: same.
+        * testsuite/22_locale/ctype/narrow/wchar_t/1.cc: same.
+        * testsuite/22_locale/ctype/narrow/wchar_t/2.cc: same.
+        * testsuite/22_locale/ctype/widen/char/1.cc: same.
+        * testsuite/22_locale/ctype/widen/wchar_t/1.cc: same.
+        * testsuite/23_containers/list_modifiers.cc: don't dereference 
+            singular reverse iterator.
+        * testsuite/23_containers/vector_bool.cc: don't increment singular
+            iterator.
+        * testsuite/24_iterators/rel_ops.cc: don't compare singular iterator.
+
 2003-06-20  Doug Gregor <dgregor@apple.com>
 
        * include/bits/basic_string.h (basic_string::replace): Dispatch 

diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr.cc b/libstdc++-v3/testsuite/20_util/auto_ptr.cc
index a6dd1c699918921bda974383f5bd0e8b1affa5ea..d70b63f3e9efa2f724046682617e808a01a6f44e 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/auto_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr.cc
@@ -197,8 +197,8 @@ test06()
   std::auto_ptr<A> A_from_A_ptr(A_from_A.release());
   VERIFY( A_from_A.get() == 0 );
   VERIFY( A_from_A_ptr.get() != 0 );
-  VERIFY( A_from_A->ctor_count == 1 );
-  VERIFY( (*A_from_A).dtor_count == 0 );
+  VERIFY( A_from_A_ptr->ctor_count == 1 );
+  VERIFY( (*A_from_A_ptr).dtor_count == 0 );
 
   A* A_ptr = A_from_A_ptr.get();
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/replace/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/replace/char/4.cc
index 47cf335daa04a8ff53e64013d3f3c589b59789e4..fcb924a8222188562c04f153334070537c5f0a16 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/replace/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/replace/char/4.cc
@@ -55,7 +55,7 @@ test04()
 
   str02 = "boards";
   char* ptr1 = &*str01.begin();
-  char* ptr2 = &*str01.end();
+  char* ptr2 = ptr1 + str01.length();
   str02.replace(str02.begin(), str02.end(), ptr1, ptr2);
   VERIFY(str02 == "geogaddi");
 }

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/replace/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/replace/wchar_t/4.cc
index bc827d03282bdd5c234396078208d4a42577626d..94baa82250dac910461f351618c65b19603e3e86 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/replace/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/replace/wchar_t/4.cc
@@ -55,7 +55,7 @@ test04()
 
   str02 = L"boards";
   wchar_t* ptr1 = &*str01.begin();
-  wchar_t* ptr2 = &*str01.end();
+  wchar_t* ptr2 = ptr1 + str01.length();
   str02.replace(str02.begin(), str02.end(), ptr1, ptr2);
   VERIFY(str02 == L"geogaddi");
 }

diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/1.cc
index b349a38aedd927f244b9f2eabd11f3e91d79ae36..bbe0c2eadf074a60d44cc77574cf0bec7fb1db2d 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/1.cc
@@ -56,7 +56,7 @@ void test01()
     }
 
   // narrow(const charT* low, const charT* high, char dfault, char* dest) const
-  ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);  
+  ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
   VERIFY( narrow_chars[0] != dfault );
   for (int i = 0; i < wide.length(); ++i)
     VERIFY( narrow_chars[i] == narrow[i] );

diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/2.cc
index 31805ae1ecc42ae1f9cd7f96823adb2e15ce7cf1..aa3ff4c70bc9fbfec02f724484749379a06ed818 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/2.cc
@@ -60,7 +60,7 @@ void test02()
     }
 
   // narrow(const charT* low, const charT* high, char dfault, char* dest) const
-  ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);  
+  ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
   VERIFY( narrow_chars[0] != dfault );
   for (int i = 0; i < wide.length(); ++i)
     VERIFY( narrow_chars[i] == narrow[i] );

diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/1.cc
index 820fe6c99bc6c7b0ae55de4aef89deefea2d6eb0..459dcf7db5766080310bc78dc7e9ca373ec296ca 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/1.cc
@@ -56,7 +56,7 @@ void test01()
     }
 
   // narrow(const charT* low, const charT* high, char dfault, char* dest) const
-  ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);  
+  ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
   VERIFY( narrow_chars[0] != dfault );
   for (int i = 0; i < wide.length(); ++i)
     VERIFY( narrow_chars[i] == narrow[i] );

diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/2.cc
index 2d7750629b1754dee9a42c75dc04a0aba2f7f206..8f8fecc6ea925bb36238913a8596e1a35cb1adf0 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/2.cc
@@ -60,7 +60,7 @@ void test02()
     }
 
   // narrow(const charT* low, const charT* high, char dfault, char* dest) const
-  ctype_c.narrow(&wide[0], &wide[wide.length()], dfault, &narrow_chars[0]);  
+  ctype_c.narrow(&wide[0], &wide[0] + wide.length(), dfault, &narrow_chars[0]);
   VERIFY( narrow_chars[0] != dfault );
   for (int i = 0; i < wide.length(); ++i)
     VERIFY( narrow_chars[i] == narrow[i] );

diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/char/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/1.cc
index ea206059bfb25f5fc5f98ccec978583656689de9..f7a2c15ad862dab7f6ff2ffef75fdd36da591116 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype/widen/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/1.cc
@@ -55,7 +55,7 @@ void test01()
     }
 
   // widen(const char* low, const char* high, charT* dest) const
-  ctype_c.widen(&narrow[0], &narrow[narrow.length()], &wide_chars[0]);  
+  ctype_c.widen(&narrow[0], &narrow[0] + narrow.length(), &wide_chars[0]);  
   for (int i = 0; i < narrow.length(); ++i)
     VERIFY( wide_chars[i] == wide[i] );
 }

diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/1.cc
index e0b33155bb9108b43a5fbbde81b6c8fc523f7783..042a0b5f705e6afd7bb18eeeb2f1c854ccb1786e 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/1.cc
@@ -55,7 +55,7 @@ void test01()
     }
 
   // widen(const char* low, const char* high, charT* dest) const
-  ctype_c.widen(&narrow[0], &narrow[narrow.length()], &wide_chars[0]);  
+  ctype_c.widen(&narrow[0], &narrow[0] + narrow.length(), &wide_chars[0]);  
   for (int i = 0; i < narrow.length(); ++i)
     VERIFY( wide_chars[i] == wide[i] );
 }

diff --git a/libstdc++-v3/testsuite/23_containers/list_modifiers.cc b/libstdc++-v3/testsuite/23_containers/list_modifiers.cc
index 213fc41f17ddff9de8ddf13db1c1bc76c5489178..8cdc9f0e254ff41eac5fa5ca30563a56f90f9376 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/list_modifiers.cc
+++ b/libstdc++-v3/testsuite/23_containers/list_modifiers.cc
@@ -107,14 +107,12 @@ test01()
   VERIFY(list0101.size() == 2);
   VERIFY(T::dtorCount() == 1);
   VERIFY(i->id() == 1);
-  VERIFY(j->id() == 1);
   VERIFY(k->id() == 1);
 
   list0101.pop_front();          // list should be [1]
   VERIFY(list0101.size() == 1);
   VERIFY(T::dtorCount() == 2);
   VERIFY(i->id() == 1);
-  VERIFY(j->id() == 1);
   VERIFY(k->id() == 1);
 }
 

diff --git a/libstdc++-v3/testsuite/23_containers/vector_bool.cc b/libstdc++-v3/testsuite/23_containers/vector_bool.cc
index 17836499cf9a7e2f51aaa3ff7c09b8f759100ee4..3deec4985d21fc5e104890dee4da7ac2588b3707 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector_bool.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector_bool.cc
@@ -26,7 +26,8 @@
 void test01()
 {
   std::vector<bool>::iterator i;
-  ++i;
+  if (false)
+    ++i;
 }
 
 // libstdc++/6886

diff --git a/libstdc++-v3/testsuite/24_iterators/rel_ops.cc b/libstdc++-v3/testsuite/24_iterators/rel_ops.cc
index 2c8539677206d36da350dc001313fdc33a32cb58..65034b2519fbe9b4114d408fba4d4ca2ad3835bc 100644 (file)
--- a/libstdc++-v3/testsuite/24_iterators/rel_ops.cc
+++ b/libstdc++-v3/testsuite/24_iterators/rel_ops.cc
@@ -30,7 +30,8 @@ void test01()
 {
   std::vector<int> v;
   std::vector<int>::iterator vi;
-
+  v.push_back(1);
+  vi = v.end();
   vi != v.begin();
   vi > v.begin();
   vi <= v.begin();