From nobody Fri Nov 7 03:51:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545395958345564.4085022410226; Fri, 21 Dec 2018 04:39:18 -0800 (PST) Received: from localhost ([::1]:45237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaK5E-0004SI-Mr for importer@patchew.org; Fri, 21 Dec 2018 07:39:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaK2f-0002k8-27 for qemu-devel@nongnu.org; Fri, 21 Dec 2018 07:36:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaK2Z-0003VK-5i for qemu-devel@nongnu.org; Fri, 21 Dec 2018 07:36:35 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaK2X-0003R9-7U for qemu-devel@nongnu.org; Fri, 21 Dec 2018 07:36:30 -0500 Received: by mail-wr1-x42b.google.com with SMTP id q18so5096182wrx.9 for ; Fri, 21 Dec 2018 04:36:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id k7sm11217839wrl.51.2018.12.21.04.36.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Dec 2018 04:36:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=AFGimPKHIbcCKVmKtIBgY6jxoqNSp7gGbsAx4cSo6x4=; b=cXm8c1YxSTgtNpGsGkZSi/03y1hRjHcNUDnvIf9d2mG/KlBPixMDnVYfcmRWrTOewc EuV3oMUC1utbVZPCOC6y2Y4qTNpwjpotlS1EivSvVUN7mfP3byovaJXoQyqcH+R6DEjc lxmaCkr6q/Ef6kVSaq2NOP/IAf4ImGFIXArEac02+av9Za0w7mXOaXSialN1yeAgLS2m dVrroIZpDaGcULjwzfYkPuK1aynUOU7w8usssLrGp6LnVkwYyypZtAr+MYRgaKfMzFgq /aZtDEhswgSEYHYDuoM6ItayAQNDGteWudCvdcvr4dPtplSF+FmZ/5PA32zGxfbKNM4a pwAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=AFGimPKHIbcCKVmKtIBgY6jxoqNSp7gGbsAx4cSo6x4=; b=QCyN2/0Qk0p3y2T7kPvA+DLRkoklcIvU97rW2H+QN4fOWw8yhSSJJHr1hVl1lQmEQ6 BHtU2XDWJAPweqwPmG3bs5x+WRZdU5GFPkNDntZLr1X6idLwzODx9BPZnMN4rmSvHQ4c jv1GJ8lcbTrsLFh6MsIt2ttc35eK9MqgOi4JoJ2jbRrptpyVh7bjam1YFJ05r7lyOb8E fqgsQeGuTMCj4TcaxjMqqv4ljWfd2i/+ourtVORN/CZcOl4sC7uBtdTZYKTp7b/xMZ+V aqrz6TVfn7W6bPhvcuGsLISMCwAngf//V5FKqws7fGgOLGwbpxfqr4rLAmaIePqQRsi5 2idw== X-Gm-Message-State: AJcUukcYU7m9Otn6cnv/5sFtV8Ho0IQOEcsAoXiwUCOzcnPxCQTL8/GW DrsQVSi19J/sopj0jHd48vJQbJSb X-Google-Smtp-Source: ALg8bN4VZY5CX0PbxkAWOGIBF+tyE4ljd+q8o3oHtxxyd6F3z2EaitLcSsPwKNSA8g4J0Ill8HxZTA== X-Received: by 2002:adf:fd87:: with SMTP id d7mr2385015wrr.74.1545395786363; Fri, 21 Dec 2018 04:36:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Dec 2018 13:36:22 +0100 Message-Id: <1545395783-39040-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1545395783-39040-1-git-send-email-pbonzini@redhat.com> References: <1545395783-39040-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Message-Id: <1543513531-1151-2-git-send-email-pbonzini@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- tests/cdrom-test.c | 2 +- tests/ivshmem-test.c | 5 ++--- tests/migration-test.c | 8 ++++---- tests/test-crypto-pbkdf.c | 3 ++- 4 files changed, 9 insertions(+), 9 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) =20 if (exec_genisoimg(genisocheck)) { /* genisoimage not available - so can't run tests */ - return 0; + return g_test_run(); } =20 ret =3D prepare_image(arch, isoimage); diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index 089e268..fe5eb30 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -492,7 +492,7 @@ int main(int argc, char **argv) /* shm */ tmpshm =3D mktempshm(TMPSHMSIZE, &fd); if (!tmpshm) { - return 0; + goto out; } tmpshmem =3D mmap(0, TMPSHMSIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd,= 0); g_assert(tmpshmem !=3D MAP_FAILED); @@ -514,9 +514,8 @@ int main(int argc, char **argv) } } =20 +out: ret =3D g_test_run(); - cleanup(); - return ret; } 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); =20 if (!ufd_version_check()) { - return 0; + return g_test_run(); } =20 /* @@ -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(); } =20 /* @@ -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 } =20 diff --git a/tests/test-crypto-pbkdf.c b/tests/test-crypto-pbkdf.c index d937aff..85ed1f9 100644 --- a/tests/test-crypto-pbkdf.c +++ b/tests/test-crypto-pbkdf.c @@ -440,6 +440,7 @@ int main(int argc, char **argv) #else int main(int argc, char **argv) { - return 0; + g_test_init(&argc, &argv, NULL); + return g_test_run(); } #endif --=20 1.8.3.1