aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo@gcc.gnu.org>2013-12-05 23:17:57 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-12-05 23:17:57 +0000
commitc48ff202fc3ce7c8cfaea4944f7003f026390171 (patch)
treecf2a7112e33c1c3a896ad49b154af78338ac8a0e
parent5ba505e708576b6b0e1b76d4662c078cf837d283 (diff)
downloadgcc-c48ff202fc3ce7c8cfaea4944f7003f026390171.zip
gcc-c48ff202fc3ce7c8cfaea4944f7003f026390171.tar.gz
gcc-c48ff202fc3ce7c8cfaea4944f7003f026390171.tar.bz2
pr15774-1.C: Adjust expected message.
2013-12-05 Paolo Carlini <paolo.carlini@oracle.com> * g++.dg/warn/pr15774-1.C: Adjust expected message. From-SVN: r205722
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/g++.dg/warn/pr15774-1.C2
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 535ab59..a97ab31 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-05 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * g++.dg/warn/pr15774-1.C: Adjust expected message.
+
2013-12-05 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/59317
@@ -27,7 +31,7 @@
* c-c++-common/tsan/thread_leak2.c: New test.
* c-c++-common/tsan/tiny_race.c: New test.
* c-c++-common/tsan/tls_race.c: New test.
- * c-c++-common/tsan/write_in_reader_lock.c: New test.
+ * c-c++-common/tsan/write_in_reader_lock.c: New test.
* lib/tsan-dg.exp: New file.
* gcc.dg/tsan/tsan.exp: New file.
* g++.dg/tsan/tsan.exp: New file.
diff --git a/gcc/testsuite/g++.dg/warn/pr15774-1.C b/gcc/testsuite/g++.dg/warn/pr15774-1.C
index 116ec83..6148ffe 100644
--- a/gcc/testsuite/g++.dg/warn/pr15774-1.C
+++ b/gcc/testsuite/g++.dg/warn/pr15774-1.C
@@ -1,6 +1,6 @@
// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } }
// Test that an new declartion with different attributes then old one fail.
-extern void foo (int); // { dg-error "ambiguates old declaration" }
+extern void foo (int); // { dg-message "old declaration" }
void
bar (void)