From: Thomas Huth <thuth@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: Re: [Qemu-devel] [PATCH 1/2] test: execute g_test_run when tests are skipped
Date: Fri, 30 Nov 2018 08:10:18 +0100 [thread overview]
Message-ID: <548a82cc-c514-e8b4-1a8d-6cab8e5def3b@redhat.com> (raw)
In-Reply-To: <1543513531-1151-2-git-send-email-pbonzini@redhat.com>
On 2018-11-29 18:45, Paolo Bonzini wrote:
> 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>
> ---
> tests/cdrom-test.c | 2 +-
> tests/migration-test.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c
> index 9b43dc9..14bd981 100644
> --- a/tests/cdrom-test.c
> +++ b/tests/cdrom-test.c
> @@ -169,7 +169,7 @@ int main(int argc, char **argv)
>
> if (exec_genisoimg(genisocheck)) {
> /* genisoimage not available - so can't run tests */
> - return 0;
> + return g_test_run();
> }
>
> ret = prepare_image(arch, isoimage);
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 06ca506..8352612 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -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
> }
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2018-11-30 7:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-29 17:45 [Qemu-devel] [PATCH for-4.0 0/2] test: replace gtester with a TAP driver Paolo Bonzini
2018-11-29 17:45 ` [Qemu-devel] [PATCH 1/2] test: execute g_test_run when tests are skipped Paolo Bonzini
2018-11-29 20:48 ` Eric Blake
2018-11-30 7:10 ` Thomas Huth [this message]
2018-11-29 17:45 ` [Qemu-devel] [PATCH 2/2] test: replace gtester with a TAP driver Paolo Bonzini
2018-11-29 21:06 ` Eric Blake
2018-11-29 22:04 ` Paolo Bonzini
2018-11-30 15:50 ` Daniel P. Berrangé
2018-11-30 16:19 ` Paolo Bonzini
2018-11-29 20:43 ` [Qemu-devel] [PATCH for-4.0 0/2] " Eric Blake
2018-11-30 7:21 ` Thomas Huth
2018-11-30 9:58 ` Paolo Bonzini
2018-11-30 14:47 ` Cleber Rosa
2018-11-30 15:05 ` Thomas Huth
2018-11-30 9:54 ` Daniel P. Berrangé
2018-11-30 9:56 ` Paolo Bonzini
2018-11-30 10:21 ` Daniel P. Berrangé
2018-12-06 21:50 [Qemu-devel] [PATCH for-4.0 v2 " Paolo Bonzini
2018-12-06 21:50 ` [Qemu-devel] [PATCH 1/2] test: execute g_test_run when tests are skipped Paolo Bonzini
2018-12-07 6:17 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=548a82cc-c514-e8b4-1a8d-6cab8e5def3b@redhat.com \
--to=thuth@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.