]> xenbits.xensource.com Git - people/dariof/libvirt.git/commitdiff
tests: consistently use virFilePrintf
authorEric Blake <eblake@redhat.com>
Mon, 29 Jul 2013 18:01:19 +0000 (12:01 -0600)
committerEric Blake <eblake@redhat.com>
Mon, 29 Jul 2013 18:06:05 +0000 (12:06 -0600)
Commit a2619962 introduced virFilePrintf to work around the fact
that gnulib doesn't (yet) provide guarantees about fprintf() vs.
%z, which in turn causes all sorts of mingw compilation errors:

../../tests/testutils.c: In function 'virtTestResult':
../../tests/testutils.c:101:9: error: unknown conversion type character 'z' in format [-Werror=format=]
         fprintf(stderr, "%3zu) %-60s ", testCounter, name);
         ^

Rather than s/fprintf/virFilePrintf/ (and reformatting loads of
lines) across multiple files, it's easier to just hack the entire
testsuite to take advantage of our helper function.

* tests/testutils.c: s/fprintf/virFilePrintf/ for mingw.

Signed-off-by: Eric Blake <eblake@redhat.com>
tests/testutils.h

index bf5c701743d16743764242babad3fb0c5dad32dc..73c5f884c1136899ff9d1062bc980bb571873fd7 100644 (file)
 # define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */
 # define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */
 
+/* Work around lack of gnulib support for fprintf %z */
+# undef fprintf
+# define fprintf virFilePrintf
+
 extern char *progname;
 extern char *abs_srcdir;