mirror of https://github.com/xqemu/xqemu.git
tests/migration-test: Silence the kvm_hv message by default
When running "make check" on a non-POWER host, the output is quite distorted like this: [...] GTESTER check-qtest-nios2 GTESTER check-qtest-or1k GTESTER check-qtest-ppc64 Skipping test: kvm_hv not available Skipping test: kvm_hv not available Skipping test: kvm_hv not available Skipping test: kvm_hv not available GTESTER check-qtest-ppcemb GTESTER check-qtest-ppc GTESTER check-qtest-riscv32 GTESTER check-qtest-riscv64 [...] Move the check to the beginning of the main function instead, so that we do not have to test the condition again and again for each test, and better use g_test_message() instead of g_print() here, like it is also done in ufd_version_check() already. Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <1534419358-10932-2-git-send-email-thuth@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
98a43bf0bb
commit
880b169a45
|
@ -438,15 +438,6 @@ static int test_migrate_start(QTestState **from, QTestState **to,
|
|||
" -incoming %s",
|
||||
accel, tmpfs, bootpath, uri);
|
||||
} else if (strcmp(arch, "ppc64") == 0) {
|
||||
|
||||
/* On ppc64, the test only works with kvm-hv, but not with kvm-pr
|
||||
* and TCG is touchy due to race conditions on dirty bits
|
||||
* (especially on PPC for some reason)
|
||||
*/
|
||||
if (access("/sys/module/kvm_hv", F_OK)) {
|
||||
g_print("Skipping test: kvm_hv not available ");
|
||||
return -1;
|
||||
}
|
||||
cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
|
||||
" -name source,debug-threads=on"
|
||||
" -serial file:%s/src_serial"
|
||||
|
@ -750,6 +741,17 @@ int main(int argc, char **argv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG
|
||||
* is touchy due to race conditions on dirty bits (especially on PPC for
|
||||
* some reason)
|
||||
*/
|
||||
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;
|
||||
}
|
||||
|
||||
tmpfs = mkdtemp(template);
|
||||
if (!tmpfs) {
|
||||
g_test_message("mkdtemp on path (%s): %s\n", template, strerror(errno));
|
||||
|
|
Loading…
Reference in New Issue