conv-op1.C: Adjust text of expected messages.

gcc/testsuite/ChangeLog:

	* g++.dg/overload/conv-op1.C: Adjust text of expected messages.
	* g++.dg/ubsan/pr63956.C: Same.
	* g++.old-deja/g++.pt/assign1.C: Same.

From-SVN: r271364

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a27f50821b3e080c90ac14a4e6163313ae47ddee..dd955bfb191852efd8134716761d19d2b1a7677a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,10 @@
 
        * gcc.dg/gcc_diag-11.c: Remove accidentally committed test.
 
+       * g++.dg/overload/conv-op1.C: Adjust text of expected messages.
+       * g++.dg/ubsan/pr63956.C: Same.
+       * g++.old-deja/g++.pt/assign1.C: Same.
+
 2019-05-17  Thomas Schwinge  <thomas@codesourcery.com>
 
        PR testsuite/89433

diff --git a/gcc/testsuite/g++.dg/overload/conv-op1.C b/gcc/testsuite/g++.dg/overload/conv-op1.C
index abcd7413b1f881aeabe8215969d9f137b0b38835..d3096192bfa2f9a7ee0befca31cb3ba5d184a9cc 100644 (file)
--- a/gcc/testsuite/g++.dg/overload/conv-op1.C
+++ b/gcc/testsuite/g++.dg/overload/conv-op1.C
@@ -10,7 +10,7 @@ struct A
 void f()
 {
   const int i = 42;
-  A()(i);                      // { dg-message "<conversion>" }
+  A()(i);                      // { dg-message "(conversion)" }
   // { dg-error "qualifiers" "" { target *-*-* } .-1 }
 }
 

diff --git a/gcc/testsuite/g++.dg/ubsan/pr63956.C b/gcc/testsuite/g++.dg/ubsan/pr63956.C
index cd67c32a547a744eb16d4ca88943d6faa2bef67a..1aac3ec9a666a4b85bbb2570052d9e5233911ab7 100644 (file)
--- a/gcc/testsuite/g++.dg/ubsan/pr63956.C
+++ b/gcc/testsuite/g++.dg/ubsan/pr63956.C
@@ -11,7 +11,7 @@ fn1 (int a, int b)
   if (b != 2)
     a <<= b;
     // { dg-error "5 << -2.. is negative" "" { target *-*-* } .-1 }
-    // { dg-error "is greater than or equal to the precision of the left operand" "" { target *-*-* } .-2 }
+    // { dg-error "is greater than or equal to the precision .. of the left operand" "" { target *-*-* } .-2 }
     // { dg-error "-2 << 4.. is negative" "" { target *-*-* } .-3 }
   return a;
 }
@@ -34,7 +34,7 @@ fn2 (int a, int b)
   if (b != 2)
     a >>= b;
     // { dg-error "4 >> -1.. is negative" "" { target *-*-* } .-1 }
-    // { dg-error "is greater than or equal to the precision of the left operand" "" { target *-*-* } .-2 }
+    // { dg-error "is greater than or equal to the precision .. of the left operand" "" { target *-*-* } .-2 }
 
   return a;
 }

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/assign1.C b/gcc/testsuite/g++.old-deja/g++.pt/assign1.C
index 95cbee0daddf676712507b49ea45f7a8c99258fb..3dfa728f18efde19a29df5832356595f5e5633ed 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.pt/assign1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/assign1.C
@@ -2,7 +2,7 @@
 // Origin: Mark Mitchell <mark@codesourcery.com>
 
 template <class T>
-struct S {  // { dg-error "const member\[^\n\r\]*can't use default assignment operator" }
+struct S {  // { dg-error "const member\[^\n\r\]*cannot use default assignment operator" }
   S();
   T t;
 };