From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 26 Oct 2011 00:36:44 +0000 (+0100)
Subject: ms_c90-printf-1.c, [...]: Update expected messages.
X-Git-Tag: releases/gcc-4.7.0~2807
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1be82918f10f817cd5f730398a36b749499d8869;p=thirdparty%2Fgcc.git

ms_c90-printf-1.c, [...]: Update expected messages.

	* gcc.dg/format/ms_c90-printf-1.c, gcc.dg/format/ms_c90-scanf-1.c:
	Update expected messages.

From-SVN: r180465
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 673e53aad321..dbe2481c572a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/format/ms_c90-printf-1.c, gcc.dg/format/ms_c90-scanf-1.c:
+	Update expected messages.
+
 2011-10-25  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc.dg/vect/slp-multitypes-2.c: Do not XFAIL on SPARC 32-bit.
diff --git a/gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c b/gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c
index f99d4c49db91..cce2342a565f 100644
--- a/gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c
@@ -167,7 +167,7 @@ foo (int i, int i1, int i2, unsigned int u, double d, char *s, void *p,
   */
   printf ("%d", u);
   /* Wrong number of arguments.  */
-  printf ("%d%d", i); /* { dg-warning "arguments" "wrong number of args" } */
+  printf ("%d%d", i); /* { dg-warning "matching" "wrong number of args" } */
   printf ("%d", i, i); /* { dg-warning "arguments" "wrong number of args" } */
   /* Miscellaneous bogus constructions.  */
   printf (""); /* { dg-warning "zero-length" "warning for empty format" } */
diff --git a/gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c b/gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c
index 6e2cb10063bb..f52ed20ea362 100644
--- a/gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c
@@ -106,7 +106,7 @@ foo (int *ip, unsigned int *uip, short int *hp, unsigned short int *uhp,
   scanf ("%s", cs); /* { dg-warning "constant" "%s writing into const" } */
   scanf ("%p", pcp); /* { dg-warning "constant" "%p writing into const" } */
   /* Wrong number of arguments.  */
-  scanf ("%d%d", ip); /* { dg-warning "arguments" "wrong number of args" } */
+  scanf ("%d%d", ip); /* { dg-warning "matching" "wrong number of args" } */
   scanf ("%d", ip, ip); /* { dg-warning "arguments" "wrong number of args" } */
   /* Miscellaneous bogus constructions.  */
   scanf (""); /* { dg-warning "zero-length" "warning for empty format" } */