mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-20 06:50:22 +03:00
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.
This commit is contained in:
parent
633d859b73
commit
eb41338e25
@ -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
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user