raw-string-3.c: Add comments to checks for multiple messages reported for for one...

	* c-c++-common/raw-string-3.c: Add comments to checks for multiple
	messages reported for for one line of source code.
	* c-c++-common/raw-string-5.c: Likewise.
	* c-c++-common/raw-string-4.c: Likewise.
	* c-c++-common/raw-string-6.c: Likewise.
	* c-c++-common/pr20000.c: Likewise.

From-SVN: r188477

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8d54fabe4755f31b4a9f2b0c7654cb5ebdf21e98..33fdad1802ad99a579f632dca09866537b80a829 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2012-06-12  Janis Johnson  <janisjo@codesourcery.com>
 
+       * c-c++-common/raw-string-3.c: Add comments to checks for multiple
+       messages reported for for one line of source code.
+       * c-c++-common/raw-string-5.c: Likewise.
+       * c-c++-common/raw-string-4.c: Likewise.
+       * c-c++-common/raw-string-6.c: Likewise.
+       * c-c++-common/pr20000.c: Likewise.
+
        * gcc.dg/cpp/include2a.c: Add comments to checks for multiple
        messages reported for one line of source code.
        * gcc.dg/cpp/pr30786.c: Likewise.

diff --git a/gcc/testsuite/c-c++-common/pr20000.c b/gcc/testsuite/c-c++-common/pr20000.c
index 3c0fb8841051ad1c5162843e4673964335ef4eac..17aadd9a38b5d85bc994c50f464ff5664785688a 100644 (file)
--- a/gcc/testsuite/c-c++-common/pr20000.c
+++ b/gcc/testsuite/c-c++-common/pr20000.c
@@ -9,8 +9,8 @@ void h(void) __attribute__((noreturn));
 
 
 int g(void) {
-  return 1; /* { dg-warning "function declared 'noreturn' has a 'return' statement" } */
-}           /* { dg-warning "'noreturn' function does return" "" { target *-*-* } 12 } */
+  return 1; /* { dg-warning "function declared 'noreturn' has a 'return' statement" "has return" } */
+}           /* { dg-warning "'noreturn' function does return" "does return" { target *-*-* } 12 } */
 
 int g2(void) {
   h();
@@ -24,8 +24,8 @@ int vg(void);
 int vg2(void); /* { dg-bogus ".noreturn. function returns non-void value" } */
 
 int vg(void) {
-  return 1; /* { dg-warning "function declared 'noreturn' has a 'return' statement" "" { target c } 27 } */
-}           /* { dg-warning "'noreturn' function does return" "" { target c } 27  } */
+  return 1; /* { dg-warning "function declared 'noreturn' has a 'return' statement" "has return" { target c } 27 } */
+}           /* { dg-warning "'noreturn' function does return" "does return" { target c } 27  } */
 
 int vg2(void) {
   h();

diff --git a/gcc/testsuite/c-c++-common/raw-string-3.c b/gcc/testsuite/c-c++-common/raw-string-3.c
index 70d4145da0c0a4cdd2004e13accde452d0a0ab13..f20337fda49a1ad61854a59efc93e81da73405fe 100644 (file)
--- a/gcc/testsuite/c-c++-common/raw-string-3.c
+++ b/gcc/testsuite/c-c++-common/raw-string-3.c
@@ -4,27 +4,27 @@
 // { dg-options "" { target c } }
 // { dg-options "-std=c++98" { target c++ } }
 
-const void     *s0     = R"(a)";       // { dg-error "was not declared|undeclared" }
-                // { dg-error "expected ',' or ';'" "" { target c } 7 }
-const void     *s1     = uR"(a)";      // { dg-error "was not declared|undeclared" }
-                // { dg-error "expected ',' or ';'" "" { target c } 9 }
-const void     *s2     = UR"(a)";      // { dg-error "was not declared|undeclared" }
-                // { dg-error "expected ',' or ';'" "" { target c } 11 }
-const void     *s3     = u8R"(a)";     // { dg-error "was not declared|undeclared" }
-                // { dg-error "expected ',' or ';'" "" { target c } 13 }
-const void     *s4     = LR"(a)";      // { dg-error "was not declared|undeclared" }
-                // { dg-error "expected ',' or ';'" "" { target c } 15 }
-
-const int      i0      = R'a';         // { dg-error "was not declared" "" { target c++ } }
-                // { dg-error "expected ',' or ';'" "" { target c } 18 }
-const int      i1      = uR'a';        // { dg-error "was not declared" "" { target c++ } }
-                // { dg-error "expected ',' or ';'" "" { target c } 20 }
-const int      i2      = UR'a';        // { dg-error "was not declared" "" { target c++ } }
-                // { dg-error "expected ',' or ';'" "" { target c } 22 }
-const int      i3      = u8R'a';       // { dg-error "was not declared" "" { target c++ } }
-                // { dg-error "expected ',' or ';'" "" { target c } 24 }
-const int      i4      = LR'a';        // { dg-error "was not declared" "" { target c++ } }
-                // { dg-error "expected ',' or ';'" "" { target c } 26 }
+const void     *s0     = R"(a)";       // { dg-error "was not declared|undeclared" "undeclared" }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 7 }
+const void     *s1     = uR"(a)";      // { dg-error "was not declared|undeclared" "undeclared" }
+                // { dg-error "expected ',' or ';'" expected" { target c } 9 }
+const void     *s2     = UR"(a)";      // { dg-error "was not declared|undeclared" "undeclared" }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 11 }
+const void     *s3     = u8R"(a)";     // { dg-error "was not declared|undeclared" "undeclared" }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 13 }
+const void     *s4     = LR"(a)";      // { dg-error "was not declared|undeclared" "undeclared" }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 15 }
+
+const int      i0      = R'a';         // { dg-error "was not declared" "undeclared" { target c++ } }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 18 }
+const int      i1      = uR'a';        // { dg-error "was not declared" "undeclared" { target c++ } }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 20 }
+const int      i2      = UR'a';        // { dg-error "was not declared" "undeclared" { target c++ } }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 22 }
+const int      i3      = u8R'a';       // { dg-error "was not declared" "undeclared" { target c++ } }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 24 }
+const int      i4      = LR'a';        // { dg-error "was not declared" "undeclared" { target c++ } }
+                // { dg-error "expected ',' or ';'" "expected" { target c } 26 }
 
 #define R      "a"
 #define uR     "b"

diff --git a/gcc/testsuite/c-c++-common/raw-string-4.c b/gcc/testsuite/c-c++-common/raw-string-4.c
index 95825d7c9cf3d618d46cc907b1419e1b9e53c3be..40b42aa643a06a4911b6cdca6dac278656039a7d 100644 (file)
--- a/gcc/testsuite/c-c++-common/raw-string-4.c
+++ b/gcc/testsuite/c-c++-common/raw-string-4.c
@@ -3,16 +3,16 @@
 // { dg-options "-std=gnu99" { target c } }
 // { dg-options "-std=c++0x" { target c++ } }
 
-const int      i0      = R'a'; // { dg-error "was not declared|undeclared" }
-               // { dg-error "expected ',' or ';'" "" { target c } 6 }
-const int      i1      = uR'a';        // { dg-error "was not declared|undeclared" }
-               // { dg-error "expected ',' or ';'" "" { target c } 8 }
-const int      i2      = UR'a';        // { dg-error "was not declared|undeclared" }
-               // { dg-error "expected ',' or ';'" "" { target c } 10 }
-const int      i3      = u8R'a';       // { dg-error "was not declared|undeclared" }
-               // { dg-error "expected ',' or ';'" "" { target c } 12 }
-const int      i4      = LR'a';        // { dg-error "was not declared|undeclared" }
-               // { dg-error "expected ',' or ';'" "" { target c } 14 }
+const int      i0      = R'a'; // { dg-error "was not declared|undeclared" "undeclared" }
+               // { dg-error "expected ',' or ';'" "expected" { target c } 6 }
+const int      i1      = uR'a';        // { dg-error "was not declared|undeclared" "undeclared" }
+               // { dg-error "expected ',' or ';'" "expected" { target c } 8 }
+const int      i2      = UR'a';        // { dg-error "was not declared|undeclared" "undeclared" }
+               // { dg-error "expected ',' or ';'" "expected" { target c } 10 }
+const int      i3      = u8R'a';       // { dg-error "was not declared|undeclared" "undeclared" }
+               // { dg-error "expected ',' or ';'" "expected" { target c } 12 }
+const int      i4      = LR'a';        // { dg-error "was not declared|undeclared" "undeclared" }
+               // { dg-error "expected ',' or ';'" "expected" { target c } 14 }
 
 #define R      1 +
 #define uR     2 +

diff --git a/gcc/testsuite/c-c++-common/raw-string-5.c b/gcc/testsuite/c-c++-common/raw-string-5.c
index adcdb75baa34fb1b43636521c4913a1e02b1a072..a26b87dc6c707d05976c827598551c0b1c6df783 100644 (file)
--- a/gcc/testsuite/c-c++-common/raw-string-5.c
+++ b/gcc/testsuite/c-c++-common/raw-string-5.c
@@ -3,25 +3,25 @@
 // { dg-options "-std=c++0x" { target c++ } }
 
 const void *s0 = R"0123456789abcdefg()0123456789abcdefg";
-       // { dg-error "raw string delimiter longer" "" { target *-*-* } 5 }
-       // { dg-error "stray" "" { target *-*-* } 5 }
+       // { dg-error "raw string delimiter longer" "longer" { target *-*-* } 5 }
+       // { dg-error "stray" "stray" { target *-*-* } 5 }
 const void *s1 = R" () ";
-       // { dg-error "invalid character" "" { target *-*-* } 8 }
-       // { dg-error "stray" "" { target *-*-* } 8 }
+       // { dg-error "invalid character" "invalid" { target *-*-* } 8 }
+       // { dg-error "stray" "stray" { target *-*-* } 8 }
 const void *s2 = R"    ()      ";
-       // { dg-error "invalid character" "" { target *-*-* } 11 }
-       // { dg-error "stray" "" { target *-*-* } 11 }
+       // { dg-error "invalid character" "invalid" { target *-*-* } 11 }
+       // { dg-error "stray" "stray" { target *-*-* } 11 }
 const void *s3 = R")())";
-       // { dg-error "invalid character" "" { target *-*-* } 14 }
-       // { dg-error "stray" "" { target *-*-* } 14 }
+       // { dg-error "invalid character" "invalid" { target *-*-* } 14 }
+       // { dg-error "stray" "stray" { target *-*-* } 14 }
 const void *s4 = R"@()@";
-       // { dg-error "invalid character" "" { target *-*-* } 17 }
-       // { dg-error "stray" "" { target *-*-* } 17 }
+       // { dg-error "invalid character" "invalid" { target *-*-* } 17 }
+       // { dg-error "stray" "stray" { target *-*-* } 17 }
 const void *s5 = R"$()$";
-       // { dg-error "invalid character" "" { target *-*-* } 20 }
-       // { dg-error "stray" "" { target *-*-* } 20 }
+       // { dg-error "invalid character" "invalid" { target *-*-* } 20 }
+       // { dg-error "stray" "stray" { target *-*-* } 20 }
 const void *s6 = R"\u0040()\u0040";
-       // { dg-error "invalid character" "" { target *-*-* } 23 }
-       // { dg-error "stray" "" { target *-*-* } 23 }
+       // { dg-error "invalid character" "invalid" { target *-*-* } 23 }
+       // { dg-error "stray" "stray" { target *-*-* } 23 }
 
 int main () {}

diff --git a/gcc/testsuite/c-c++-common/raw-string-6.c b/gcc/testsuite/c-c++-common/raw-string-6.c
index a3ae422896be4acdee3a595e5153d1cc6732a8ce..87ee4c1c47c982a1706bd7f7d454138ec54d1bc1 100644 (file)
--- a/gcc/testsuite/c-c++-common/raw-string-6.c
+++ b/gcc/testsuite/c-c++-common/raw-string-6.c
@@ -2,5 +2,5 @@
 // { dg-options "-std=gnu99" { target c } }
 // { dg-options "-std=c++0x" { target c++ } }
 
-const void *s0 = R"ouch()ouCh";        // { dg-error "at end of input" }
-       // { dg-error "unterminated raw string" "" { target *-*-* } 5 }
+const void *s0 = R"ouch()ouCh";        // { dg-error "at end of input" "end" }
+       // { dg-error "unterminated raw string" "unterminated" { target *-*-* } 5 }