mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
test: execute g_test_run when tests are skipped
Sometimes a test's main() function recognizes that the environment does not support the test, and therefore exits. In this case, we still should run g_test_run() so that a TAP harness will print the test plan ("1..0") and the test will be marked as skipped. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1543513531-1151-2-git-send-email-pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
4ac8086647
commit
4848cb3d9f
4 changed files with 9 additions and 9 deletions
|
@ -789,7 +789,7 @@ int main(int argc, char **argv)
|
|||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
if (!ufd_version_check()) {
|
||||
return 0;
|
||||
return g_test_run();
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -800,7 +800,7 @@ int main(int argc, char **argv)
|
|||
if (g_str_equal(qtest_get_arch(), "ppc64") &&
|
||||
access("/sys/module/kvm_hv", F_OK)) {
|
||||
g_test_message("Skipping test: kvm_hv not available");
|
||||
return 0;
|
||||
return g_test_run();
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -811,11 +811,11 @@ int main(int argc, char **argv)
|
|||
#if defined(HOST_S390X)
|
||||
if (access("/dev/kvm", R_OK | W_OK)) {
|
||||
g_test_message("Skipping test: kvm not available");
|
||||
return 0;
|
||||
return g_test_run();
|
||||
}
|
||||
#else
|
||||
g_test_message("Skipping test: Need s390x host to work properly");
|
||||
return 0;
|
||||
return g_test_run();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue