>From eee4d77263c39b866885b6e776af76abc60fe5c2 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Tue, 30 Jun 2009 15:12:48 +0100 Subject: [PATCH 1/4] Clean up the output of the C API test code. Set output mode to unbuffered so that we see ordinary output messages and errors at the same time. Align "skipped" messages. --- src/generator.ml | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/generator.ml b/src/generator.ml index 960973d..242d292 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -4278,6 +4278,8 @@ int main (int argc, char *argv[]) int fd; int nr_tests, test_num = 0; + setbuf (stdout, NULL); + no_test_warnings (); g = guestfs_create (); @@ -4459,7 +4461,7 @@ static int %s_skip (void) static int %s (void) { if (%s_skip ()) { - printf (\"%%s skipped (reason: environment variable set)\\n\", \"%s\"); + printf (\" %%s skipped (reason: environment variable set)\\n\", \"%s\"); return 0; } @@ -4467,17 +4469,17 @@ static int %s (void) (match prereq with | Disabled -> - pr " printf (\"%%s skipped (reason: test disabled in generator)\\n\", \"%s\");\n" test_name + pr " printf (\" %%s skipped (reason: test disabled in generator)\\n\", \"%s\");\n" test_name | If _ -> pr " if (! %s_prereq ()) {\n" test_name; - pr " printf (\"%%s skipped (reason: test prerequisite)\\n\", \"%s\");\n" test_name; + pr " printf (\" %%s skipped (reason: test prerequisite)\\n\", \"%s\");\n" test_name; pr " return 0;\n"; pr " }\n"; pr "\n"; generate_one_test_body name i test_name init test; | Unless _ -> pr " if (%s_prereq ()) {\n" test_name; - pr " printf (\"%%s skipped (reason: test prerequisite)\\n\", \"%s\");\n" test_name; + pr " printf (\" %%s skipped (reason: test prerequisite)\\n\", \"%s\");\n" test_name; pr " return 0;\n"; pr " }\n"; pr "\n"; -- 1.6.2.5