inserters_extractors.cc, [...]: Replace multi-line string constants with C89-style...

2001-05-15  Zack Weinberg  <zackw@stanford.edu>

        * testsuite/21_strings/inserters_extractors.cc,
        testsuite/27_io/istream_unformatted.cc,
        testsuite/27_io/stringstream.cc:
        Replace multi-line string constants with C89-style
        concatenated string constants.

From-SVN: r42116

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2d903aa2551bbb5d91dcda390ed092bddb78bd75..6d68629371696583ba7e48cafffe8c09498e5905 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-15  Zack Weinberg  <zackw@stanford.edu>
+       
+        * testsuite/21_strings/inserters_extractors.cc,
+        testsuite/27_io/istream_unformatted.cc,
+        testsuite/27_io/stringstream.cc:
+        Replace multi-line string constants with C89-style
+        concatenated string constants.
+       
 2001-05-14  Richard Henderson  <rth@redhat.com>
 
        * mknumeric_limits: Build with -fno-exceptions.

diff --git a/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc b/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
index 261f572b94d56d30f4d091a1d44f6591cbc31a69..c91fd25faf0ca57712a6d78d6a70c1702aefde7a 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
+++ b/libstdc++-v3/testsuite/21_strings/inserters_extractors.cc
@@ -41,9 +41,8 @@ bool test01(void)
   csize_type npos = std::string::npos;
   csize_type csz01, csz02;
 
-  // { dg-warning "string literals" "" { xfail *-*-* } 45 }
-  const std::string str01("sailing grand traverse bay
-                           from Elk Rapids to the point reminds me of miles");
+  const std::string str01("sailing grand traverse bay\n"
+              "\t\t\t    from Elk Rapids to the point reminds me of miles");
   const std::string str02("sailing");
   const std::string str03("grand");
   const std::string str04("traverse");

diff --git a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
index fd88b9c56e69fe00626bd83a971c9483429bc5df..35b1d1ff6a7bf4db1642a3600f86ac25b88a8154 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
@@ -142,11 +142,13 @@ test02()
   typedef std::char_traits<char>       traits_type;
 
   bool test = true;
-  // { dg-warning "string literals" "" { xfail *-*-* } 146 }
-  const char str_lit01[] = "                       sun*ra 
-                            and his myth science arkestra present
-                            angles and demons @ play
-                            the nubians of plutonia";
+  const char str_lit01[] = "\t\t\t    sun*ra \n"
+  "                            "
+  "and his myth science arkestra present\n"
+  "                            "
+  "angles and demons @ play\n"
+  "                            "
+  "the nubians of plutonia";
   std::string str01(str_lit01);
   std::string strtmp;
 
@@ -201,8 +203,9 @@ test02()
   VERIFY( is_04.gcount() == 64 );
   VERIFY( state1 != state2 );
   VERIFY( state2 == statefail );
-  // { dg-warning "string literals" "" { xfail *-*-* } 205 }
-  VERIFY( !traits_type::compare("                            and his myth science arkestra presen", carray1, 65) );
+  VERIFY( !traits_type::compare(
+  "                            and his myth science arkestra presen",
+                               carray1, 65) );
 
   is_04.clear();
   state1 = is_04.rdstate();
@@ -234,10 +237,11 @@ test03()
   typedef std::char_traits<char>       traits_type;
 
   bool test = true;
-  // { dg-warning "string literals" "" { xfail *-*-* } 238 }
-  const char str_lit01[] = "   sun*ra 
-                          & his arkestra, featuring john gilmore: 
-                         jazz in silhouette: images and forecasts of tomorrow";
+  const char str_lit01[] = 
+  "   sun*ra \n\t\t\t   & his arkestra, featuring john gilmore: \n"
+  "                         "
+    "jazz in silhouette: images and forecasts of tomorrow";
+
   std::string str01(str_lit01);
   std::string strtmp;
 
@@ -360,23 +364,21 @@ test04()
 int
 test05()
 {
-  // { dg-warning "string literals" "" { xfail *-*-* } 364 }
-  const char* charray = "
-a
-aa
-aaa
-aaaa
-aaaaa
-aaaaaa
-aaaaaaa
-aaaaaaaa
-aaaaaaaaa
-aaaaaaaaaa
-aaaaaaaaaaa
-aaaaaaaaaaaa
-aaaaaaaaaaaaa
-aaaaaaaaaaaaaa
-";
+  const char* charray = "\n"
+"a\n"
+"aa\n"
+"aaa\n"
+"aaaa\n"
+"aaaaa\n"
+"aaaaaa\n"
+"aaaaaaa\n"
+"aaaaaaaa\n"
+"aaaaaaaaa\n"
+"aaaaaaaaaa\n"
+"aaaaaaaaaaa\n"
+"aaaaaaaaaaaa\n"
+"aaaaaaaaaaaaa\n"
+"aaaaaaaaaaaaaa\n";
 
   bool test = true;
   const std::streamsize it = 5;

diff --git a/libstdc++-v3/testsuite/27_io/stringstream.cc b/libstdc++-v3/testsuite/27_io/stringstream.cc
index ed3ed83073c9858cf4568a0a9acabb6109efe12e..8a841f2f854ffeb7f01b92dd49bfbbacf9f5582e 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/stringstream.cc
+++ b/libstdc++-v3/testsuite/27_io/stringstream.cc
@@ -48,9 +48,8 @@ test01()
   VERIFY( len == 0 );
 
   // Full string sanity check.
-  // { dg-warning "string literals" "" { xfail *-*-* } 52 }
-  std::string str02("these golden days, i spend waiting for you:\n 
-              Betty Carter on Verve with I'm Yours and You're Mine.");
+  std::string str02("these golden days, i spend waiting for you:\n"
+                   "Betty Carter on Verve with I'm Yours and You're Mine.");
   __i_start = str02.begin();
   __i_end = str02.end();
   len = str02.size();