aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Sebor <msebor@redhat.com>2019-05-17 23:14:09 +0000
committerMartin Sebor <msebor@gcc.gnu.org>2019-05-17 17:14:09 -0600
commit65989f1b784d323ba9544f562e885ebe90434597 (patch)
tree61a3e4efbf1822a29fa9f43c6113a15ed69e56b0 /gcc
parent1a0a374429382d49830cf5759dcb6c3e82011908 (diff)
downloadgcc-65989f1b784d323ba9544f562e885ebe90434597.zip
gcc-65989f1b784d323ba9544f562e885ebe90434597.tar.gz
gcc-65989f1b784d323ba9544f562e885ebe90434597.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/overload/conv-op1.C2
-rw-r--r--gcc/testsuite/g++.dg/ubsan/pr63956.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/assign1.C2
4 files changed, 8 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a27f508..dd955bf 100644
--- 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 abcd741..d309619 100644
--- 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 cd67c32..1aac3ec 100644
--- 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 95cbee0..3dfa728 100644
--- 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;
};