From 0cecabb505681675a3bd2dd1da3ecc813b60d654 Mon Sep 17 00:00:00 2001 From: iains Date: Sat, 13 Nov 2010 17:15:17 +0000 Subject: [PATCH] gcc/testsuite: * objc.dg/fsf-nsstring-format-1.m: Adjust format messages. * obj-c++.dg/fsf-nsstring-format-1.mm: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166713 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/obj-c++.dg/fsf-nsstring-format-1.mm | 4 ++-- gcc/testsuite/objc.dg/fsf-nsstring-format-1.m | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 708d31ab1a8..70dcd0d5988 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-13 Iain Sandoe + + * objc.dg/fsf-nsstring-format-1.m: Adjust format messages. + * obj-c++.dg/fsf-nsstring-format-1.mm: Likewise. + 2010-11-13 Paolo Bonzini PR c/46462 diff --git a/gcc/testsuite/obj-c++.dg/fsf-nsstring-format-1.mm b/gcc/testsuite/obj-c++.dg/fsf-nsstring-format-1.mm index 6e58e65dc7b..caeaa030079 100644 --- a/gcc/testsuite/obj-c++.dg/fsf-nsstring-format-1.mm +++ b/gcc/testsuite/obj-c++.dg/fsf-nsstring-format-1.mm @@ -45,7 +45,7 @@ NSString *s10 (int dum, NSString *fmt1, ... ) __attribute__((format_arg(2))) ; / void foo (void) { s1 (@"this format not checked %d %s", 3, 4); - 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 *-*-* } 48 } */ - printf(s9 (1, (char *)"and so is this %d %d %s" , 3, 4, "hm"), 5, 6, 12); /* { dg-warning "format .%s. expects type .char.., but argument 4 has type .int." } */ + printf(s9 (1, (char *)"and so is this %d %d %s" , 3, 4, "hm"), 5, 6, 12); /* { dg-warning "format '%s' expects argument of type 'char.', but argument 4 has type 'int'" } */ } diff --git a/gcc/testsuite/objc.dg/fsf-nsstring-format-1.m b/gcc/testsuite/objc.dg/fsf-nsstring-format-1.m index 2550a550168..0921bb33bca 100644 --- a/gcc/testsuite/objc.dg/fsf-nsstring-format-1.m +++ b/gcc/testsuite/objc.dg/fsf-nsstring-format-1.m @@ -38,7 +38,7 @@ NSString *s10 (int dum, NSString *fmt1, ... ) __attribute__((format_arg(2))) ; / void foo (void) { s1 (@"format not checked %d %s", 3, 4); - 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 *-*-* } 41 } */ - printf(s9 (1, "and so is this %d %d %s", 3, 4), 5, 6, 12); /* { dg-warning "format .%s. expects type .char .., but argument 4 has type .int." } */ + printf(s9 (1, "and so is this %d %d %s", 3, 4), 5, 6, 12); /* { dg-warning "format '%s' expects argument of type 'char .', but argument 4 has type 'int'" } */ } -- 2.11.0