format.exp: New file.

	* gcc.dg/format/format.exp: New file.
	* gcc.dg/c90-printf-1.c: Rename to gcc.dg/format/c90-printf-1.c.
	* gcc.dg/c90-printf-2.c: Rename to gcc.dg/format/c90-printf-2.c.
	* gcc.dg/c90-printf-3.c: Rename to gcc.dg/format/c90-printf-3.c.
	* gcc.dg/c94-printf-1.c: Rename to gcc.dg/format/c94-printf-1.c.
	* gcc.dg/c99-printf-1.c: Rename to gcc.dg/format/c99-printf-1.c.
	* gcc.dg/c99-printf-2.c: Rename to gcc.dg/format/c99-printf-2.c.
	* gcc.dg/c99-printf-3.c: Rename to gcc.dg/format/c99-printf-3.c.
	* gcc.dg/c90-scanf-1.c: Rename to gcc.dg/format/c90-scanf-1.c.
	* gcc.dg/c90-scanf-2.c: Rename to gcc.dg/format/c90-scanf-2.c.
	* gcc.dg/c90-scanf-3.c: Rename to gcc.dg/format/c90-scanf-3.c.
	* gcc.dg/c90-scanf-4.c: Rename to gcc.dg/format/c90-scanf-4.c.
	* gcc.dg/c94-scanf-1.c: Rename to gcc.dg/format/c94-scanf-1.c.
	* gcc.dg/c99-scanf-1.c: Rename to gcc.dg/format/c99-scanf-1.c.
	* gcc.dg/c99-scanf-2.c: Rename to gcc.dg/format/c99-scanf-2.c.
	* gcc.dg/c99-scanf-3.c: Rename to gcc.dg/format/c99-scanf-3.c.
	* gcc.dg/c90-strftime-1.c: Rename to gcc.dg/format/c90-strftime-1.c.
	* gcc.dg/c90-strftime-2.c: Rename to gcc.dg/format/c90-strftime-2.c.
	* gcc.dg/c99-strftime-1.c: Rename to gcc.dg/format/c99-strftime-1.c.
	* gcc.dg/c99-strftime-2.c: Rename to gcc.dg/format/c99-strftime-2.c.
	* gcc.dg/format-array-1.c: Rename to gcc.dg/format/array-1.c.
	* gcc.dg/format-attr-1.c: Rename to gcc.dg/format/attr-1.c.
	* gcc.dg/format-branch-1.c: Rename to gcc.dg/format/branch-1.c.
	* gcc.dg/format-diag-1.c: Rename to gcc.dg/format/diag-1.c.
	* gcc.dg/format-errmk-1.c: Rename to gcc.dg/format/errmk-1.c.
	* gcc.dg/format-ext-1.c: Rename to gcc.dg/format/ext-1.c.
	* gcc.dg/format-ext-2.c: Rename to gcc.dg/format/ext-2.c.
	* gcc.dg/format-ext-3.c: Rename to gcc.dg/format/ext-3.c.
	* gcc.dg/format-ext-4.c: Rename to gcc.dg/format/ext-4.c.
	* gcc.dg/format-ext-5.c: Rename to gcc.dg/format/ext-5.c.
	* gcc.dg/format-miss-1.c: Rename to gcc.dg/format/miss-1.c.
	* gcc.dg/format-miss-2.c: Rename to gcc.dg/format/miss-2.c.
	* gcc.dg/format-no-exargs-1.c: Rename to gcc.dg/format/no-exargs-1.c.
	* gcc.dg/format-no-y2k-1.c: Rename to gcc.dg/format/no-y2k-1.c.
	* gcc.dg/format-nonlit-1.c: Rename to gcc.dg/format/nonlit-1.c.
	* gcc.dg/format-nonlit-2.c: Rename to gcc.dg/format/nonlit-2.c.
	* gcc.dg/format-nonlit-3.c: Rename to gcc.dg/format/nonlit-3.c.
	* gcc.dg/format-sec-1.c: Rename to gcc.dg/format/sec-1.c.
	* gcc.dg/format-strfmon-1.c: Rename to gcc.dg/format/strfmon-1.c.
	* gcc.dg/format-va-1.c: Rename to gcc.dg/format/va-1.c.
	* gcc.dg/format-warnll-1.c: Rename to gcc.dg/format/warnll-1.c.
	* gcc.dg/format-xopen-1.c: Rename to gcc.dg/format/xopen-1.c.
	* gcc.dg/formatz-1.c: Rename to gcc.dg/format/z-1.c.

From-SVN: r38749

1 files changed, 29 insertions, 0 deletions

diff --git a/gcc/testsuite/gcc.dg/format/branch-1.c b/gcc/testsuite/gcc.dg/format/branch-1.c
new file mode 100644
index 0000000..6ff4131
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/format/branch-1.c
@@ -0,0 +1,29 @@
+/* Test for format checking of conditional expressions.  */
+/* Origin: Joseph Myers <jsm28@cam.ac.uk> */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99 -Wformat" } */
+
+#define NULL ((void *)0)
+
+extern int printf (const char *, ...);
+
+void
+foo (long l, int nfoo)
+{
+  printf ((nfoo > 1) ? "%d foos" : "%d foo", nfoo);
+  printf ((l > 1) ? "%d foos" : "%d foo", l); /* { dg-warning "int format" "wrong type in conditional expr" } */
+  printf ((l > 1) ? "%ld foos" : "%d foo", l); /* { dg-warning "int format" "wrong type in conditional expr" } */
+  printf ((l > 1) ? "%d foos" : "%ld foo", l); /* { dg-warning "int format" "wrong type in conditional expr" } */
+  /* Should allow one case to have extra arguments.  */
+  printf ((nfoo > 1) ? "%d foos" : "1 foo", nfoo);
+  printf ((nfoo > 1) ? "many foos" : "1 foo", nfoo); /* { dg-warning "too many" "too many args in all branches" } */
+  printf ((nfoo > 1) ? "%d foos" : "", nfoo);
+  printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "1 foo" : "no foos"), nfoo);
+  printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "%d foo" : "%d foos"), nfoo);
+  printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "%d foo" : "%ld foos"), nfoo); /* { dg-warning "long int format" "wrong type" } */
+  printf ((nfoo > 1) ? "%ld foos" : ((nfoo > 0) ? "%d foo" : "%d foos"), nfoo); /* { dg-warning "long int format" "wrong type" } */
+  printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "%ld foo" : "%d foos"), nfoo); /* { dg-warning "long int format" "wrong type" } */
+  /* Extra arguments to NULL should be complained about.  */
+  printf (NULL, "foo"); /* { dg-warning "too many" "NULL extra args" } */
+  /* { dg-warning "null" "null format arg" { target *-*-* } 27 } */
+}