summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>2014-11-15 15:27:18 +0000
committerfxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>2014-11-15 15:27:18 +0000
commit88421f3a44a45f3ed241aae8955ee5f2ecc652ac (patch)
tree967c40f05558dd38a1198f5ea6b73046b0f6c75e
parentbd09c0bdb0ea577910089800a3854f393abce681 (diff)
downloadgcc-88421f3a44a45f3ed241aae8955ee5f2ecc652ac.tar.gz
* gcc.dg/darwin-cfstring-format-1.c: Adjust dg-error.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217603 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7f105cc0611..f801173a250 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-19 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
+ * gcc.dg/darwin-cfstring-format-1.c: Adjust dg-error.
+
2014-11-15 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/opt44.ad[sb]: New test.
diff --git a/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c b/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c
index 6eec43876ab..992247aad7e 100644
--- a/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c
+++ b/gcc/testsuite/gcc.dg/darwin-cfstring-format-1.c
@@ -18,7 +18,7 @@ int s2 (int a, CFStringRef fmt, ... ) __attribute__((format(__CFString__, 2, 3))
int s2a (int a, CFStringRef fmt, ... ) __attribute__((format(CFString, 2, 2))) ; /* { dg-error "format string argument follows the args to be formatted" } */
int s3 (const char *fmt, ... ) __attribute__((format(__CFString__, 1, 2))) ; /* { dg-error "format argument should be a .CFString. reference but a string was found" } */
-int s4 (CFStringRef fmt, ... ) __attribute__((format(printf, 1, 2))) ; /* { dg-error "found a .CFStringRef. but the format argument should be a string" } */
+int s4 (CFStringRef fmt, ... ) __attribute__((format(printf, 1, 2))) ; /* { dg-error "found a .CFStringRef.* but the format argument should be a string" } */
char *s5 (char dum, char *fmt1, ... ) __attribute__((format_arg(2))) ; /* OK */
CFStringRef s6 (CFStringRef dum, CFStringRef fmt1, ... ) __attribute__((format_arg(2))) ; /* OK */