From nobody Fri Nov 7 00:45:01 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 1544629637250387.8685697062423; Wed, 12 Dec 2018 07:47:17 -0800 (PST) Received: from localhost ([::1]:45681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6jE-0003IP-6l for importer@patchew.org; Wed, 12 Dec 2018 10:47:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6Ma-0000r2-4A for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6MY-0000G7-9b for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:52 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6MX-00009q-R2 for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:50 -0500 Received: by mail-wm1-x333.google.com with SMTP id s14so6209893wmh.1 for ; Wed, 12 Dec 2018 07:23:43 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.23.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:23:41 -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=bF9tDh7ESYGSCI9Phk1pLO54aulpgBTrRZwreniySgM=; b=JhwaFfXAN1/vPmGmg5GnI0CCTDO39zk9/1f81oGNHnGu/5UjawsW31Y18nE6gMC7Y2 SPFopPltpm+AN/wxJusxW4x3k6PpZ+UuFNHv0/qQdcU4Nscmc4NO7vJKNf4d8sf2wp37 FGAcvC4E71q/kL3ql8vtg3NSp/RPoRsM3RmgorvFQxwT4Id+7KLH1yMnIZGxSBgNT3xy zzhHYTY+ncCujYRuKixrPDwFICfBMB6wOBdxgarODIICBLrCh552FrPPxS+1mG025DWB 13+nOpHEC3gHtTJ16DVWoFvNZr1BvvzM7fDV14LHpDirbY9bTyBj4VevQxZD5K/9SAkb hm6w== 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=bF9tDh7ESYGSCI9Phk1pLO54aulpgBTrRZwreniySgM=; b=DURZ4NQyQIPdwicPjXML1zykUlL7PHeDSpoALijNftdezBifTPE01VIKoXT0FY9vG/ OEXdrkW8JSHPPJgExDUBcCRQGB+xCyHVpTG1LKxEznv7Hp6fEmyDsRQS6mGq3C0beQd2 Q0q6ETlK6vp4CzXmMXWdGDYzPf123JuLVeVC8U0Z0DZ0zdodl/FLLT6X+ut7Ze6huOci V5SB40YGkWRa9+D4af6DAJ7Q2vmlHQubaqBr5Yye07tbERjMko1Sd2JvFaLoEWoiV0AO zPOD9LOICza4z8i4y8VFA/JQXbQKlXQe/K6BfiCFv3lo5heiIA6wQlb7UfvO11Lzmn6G swFQ== X-Gm-Message-State: AA+aEWY8C0SGubXdJ/ySWfpzCJ9rjREuDDP2415wChuPqtSX7wntCKCL 6Myf4x59W/seI4Sgm1/1t1XGvddK X-Google-Smtp-Source: AFSGD/UgTnWmDV179sRkX9amyFmLnxlwE5vvNO5shQvkuplXe2e079UroGr6ebzSf80VR2VXZp5h1Q== X-Received: by 2002:a1c:c645:: with SMTP id w66mr7252824wmf.18.1544628222507; Wed, 12 Dec 2018 07:23:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:22:43 +0100 Message-Id: <1544628195-37728-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-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::333 Subject: [Qemu-devel] [PULL 22/54] 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/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) =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/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 --=20 1.8.3.1