From: Iain Sandoe <iains@gcc.gnu.org>
Date: Tue, 23 Nov 2010 17:19:15 +0000 (+0000)
Subject: adjust for format string changes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8595dc52a0cef2f84e9dcc1e41c96737d90d55e6;p=gcc.git

adjust for format string changes.

gcc/testsuite:

	* gcc.dg/darwin-cfstring-1.c: Adjust format messages.

From-SVN: r167088
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 72ea1c55aa7..63c2d0bb341 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-23  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* gcc.dg/darwin-cfstring-1.c: Adjust format messages.
+
 2010-11-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/46499
diff --git a/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c b/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c
index 8771d526fe0..6eec43876ab 100644
--- a/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c
+++ b/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c
@@ -30,7 +30,7 @@ void foo (void)
 {
   CFStringRef notchk = CFSTR ("here is an unchecked %d %s string");
   s1 (notchk, 5, 6, 7);
-  printf("this one is checked %d %s", 3, 4, 5); /* { dg-warning "format .%s. expects type .char .., but argument 3 has type .int." } */
+  printf("this one is checked %d %s", 3, 4, 5); /* { dg-warning "format .%s. expects argument of type .char .., but argument 3 has type .int." } */
 			/* { dg-warning "too many arguments for format" "" { target *-*-* } 33 } */
-  printf(s5 (1, "and so is this %d %d %s", 3, 4, "hey", 6), 5, 6, 12);/* { dg-warning "format .%s. expects type .char .., but argument 4 has type .int." } */
-}
\ No newline at end of file
+  printf(s5 (1, "and so is this %d %d %s", 3, 4, "hey", 6), 5, 6, 12);/* { dg-warning "format .%s. expects argument of type .char .., but argument 4 has type .int." } */
+}