From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gScwU-0005lb-Uk for qemu-devel@nongnu.org; Fri, 30 Nov 2018 02:10:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gScwQ-0003lT-PM for qemu-devel@nongnu.org; Fri, 30 Nov 2018 02:10:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48954) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gScwQ-0003kR-Ez for qemu-devel@nongnu.org; Fri, 30 Nov 2018 02:10:22 -0500 References: <1543513531-1151-1-git-send-email-pbonzini@redhat.com> <1543513531-1151-2-git-send-email-pbonzini@redhat.com> From: Thomas Huth Message-ID: <548a82cc-c514-e8b4-1a8d-6cab8e5def3b@redhat.com> Date: Fri, 30 Nov 2018 08:10:18 +0100 MIME-Version: 1.0 In-Reply-To: <1543513531-1151-2-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] test: execute g_test_run when tests are skipped List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org 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 > --- > 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