[libvirt] [PATCH 1/2] tests: consistent skip messages

On RHEL 5, I noticed this test failure message: TEST: qemumonitorjsontest libvirt not compiled with yajl, skippingSKIP: qemumonitorjsontest * tests/virstoragetest.c (testPrepImages): Use simpler fputs. * tests/qemumonitorjsontest.c (mymain): Ensure trailing newline. --- Pushing under the trivial rule. tests/qemumonitorjsontest.c | 2 +- tests/virstoragetest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 16e1f98..04b8f77 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -445,7 +445,7 @@ mymain(void) virCapsPtr caps; #if !WITH_YAJL - fprintf(stderr, "libvirt not compiled with yajl, skipping"); + fputs("libvirt not compiled with yajl, skipping this test\n", stderr); return EXIT_AM_SKIP; #endif diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 9da58f3..6ca7b9a 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -90,7 +90,7 @@ testPrepImages(void) if (!qemuimg) qemuimg = virFindFileInPath("qemu-img"); if (!qemuimg) { - fprintf(stderr, "qemu-img missing or too old; skipping this test\n"); + fputs("qemu-img missing or too old; skipping this test\n", stderr); return EXIT_AM_SKIP; } @@ -136,7 +136,7 @@ testPrepImages(void) cmd = virCommandNewArgList("qemu-img", "rebase", "-u", "-f", "qcow2", "-F", "raw", "-b", "raw", "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) { - fprintf(stderr, "qemu-img is too old; skipping this test\n"); + fputs("qemu-img is too old; skipping this test\n", stderr); ret = EXIT_AM_SKIP; goto cleanup; } -- 1.8.1.2