summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-05 23:17:57 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-05 23:17:57 +0000
commit25f90c37cef5fe7bd3580fcffaf05fbf199957f8 (patch)
treecf2a7112e33c1c3a896ad49b154af78338ac8a0e
parente2c8527994800001f5bb72d5498dbbf85f411125 (diff)
downloadppe42-gcc-25f90c37cef5fe7bd3580fcffaf05fbf199957f8.tar.gz
ppe42-gcc-25f90c37cef5fe7bd3580fcffaf05fbf199957f8.zip
2013-12-05 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/warn/pr15774-1.C: Adjust expected message. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205722 138bc75d-0d04-0410-961f-82ee72b054a4
-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 535ab597d76..a97ab31b4bd 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 116ec835d90..6148ffecb5b 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)
OpenPOWER on IntegriCloud