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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 535ab597d76b019336811abb08db7d340013fb54..a97ab31b4bde8200c5b4674c7b42f0cca5abdd2e 100644 (file)
--- 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 116ec835d90bee65baff699f0bbd7a78da70d4db..6148ffecb5b625e18132f773cbccbad20954a8e3 100644 (file)
--- 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)