diff options
| author | Iain Sandoe <iains@gcc.gnu.org> | 2010-11-13 17:15:17 +0000 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2010-11-13 17:15:17 +0000 |
| commit | 989b59db15278ce97f73b7c1fdb56959241cca01 (patch) | |
| tree | d6c2726d852898f85cb90abcb09c3470e19bd8b2 | |
| parent | 3df087348e8a646b2cbc2d37accae1c28cb092dc (diff) | |
| download | gcc-989b59db15278ce97f73b7c1fdb56959241cca01.zip gcc-989b59db15278ce97f73b7c1fdb56959241cca01.tar.gz gcc-989b59db15278ce97f73b7c1fdb56959241cca01.tar.bz2 | |
fsf-nsstring-format-1.m: Adjust format messages.
gcc/testsuite:
* objc.dg/fsf-nsstring-format-1.m: Adjust format messages.
* obj-c++.dg/fsf-nsstring-format-1.mm: Likewise.
From-SVN: r166713
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/fsf-nsstring-format-1.mm | 4 | ||||
| -rw-r--r-- | 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 708d31a..70dcd0d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-13 Iain Sandoe <iains@gcc.gnu.org> + + * objc.dg/fsf-nsstring-format-1.m: Adjust format messages. + * obj-c++.dg/fsf-nsstring-format-1.mm: Likewise. + 2010-11-13 Paolo Bonzini <bonzini@gnu.org> 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 6e58e65..caeaa03 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 2550a55..0921bb3 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'" } */ } |