From nobody Sat Nov 8 10:14:59 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 1545309558775408.637718443061; Thu, 20 Dec 2018 04:39:18 -0800 (PST) Received: from localhost ([::1]:37051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZxbh-0002rr-EC for importer@patchew.org; Thu, 20 Dec 2018 07:39:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZxZW-0001hb-VX for qemu-devel@nongnu.org; Thu, 20 Dec 2018 07:37:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZxZT-0001Yy-1N for qemu-devel@nongnu.org; Thu, 20 Dec 2018 07:37:02 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36619) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZxZS-0001YO-QX for qemu-devel@nongnu.org; Thu, 20 Dec 2018 07:36:58 -0500 Received: by mail-wm1-x32a.google.com with SMTP id p6so1994803wmc.1 for ; Thu, 20 Dec 2018 04:36:58 -0800 (PST) Received: from donizetti.redhat.com ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id k19sm10897673wre.5.2018.12.20.04.36.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Dec 2018 04:36:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vdUDaHvTFVqflcUalFhmXfcw7h/ujQNQ7APn2KQtW3A=; b=M09DXTwCjBniwE0nz5vzTi/g99oWZdE2YaQzdCAYd9vCF65jD/uIfkkom1WS0LBKfa YvfV17qx1ziYmoOTsME6ZoRJUOg+mCM68st1hX7KK30oLkA4FY1/gggD+thqCx4qJ8L3 jGGDrK3iGUthmITKhI9r9qW09QghQub6ngLH+rr8Cld7M16v/h4hs22J2i2OKTJN9mOc ScuEEUrXdTrim70lW3a8CcrpUJGL1Yz2TLr1ws+PAirDEZmVWQSHQa5Y9b8goGhWqRrF KcjgCNShmw3QbeRxCsDgAcUHy1NF1vOOAoh7D1VNa+TUX0RGaHXPeb/MogkctDrqL7t9 56cQ== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vdUDaHvTFVqflcUalFhmXfcw7h/ujQNQ7APn2KQtW3A=; b=m5+K4a+Z3OeU5Ia9h+CwbrIHibXrnkwVPF+lfLqSZaTsIQcDpfjUTtIsU5VRzHTV9X wjWnnlqvqFfIvhs59fstmbc+2rBaP80S1jHfD7YCahtxYGeJpTVU786ckS+LeCJGL2Yo /0MN9B4fdJZxNYdpCoZ5NmdSyZrkNQmfkmPlKdedHJQ3C3MuFlUn5zOSWJivCk6ewOZU bVKsJ1rAqhDTWAhYVQroxuoZuRiHdrccYmqz9SD9R4ZpnR9Y3fpSGLK/PB0DBJhWEmcM P91Ss1pgQV+cV3x8Y0klj68JtpSQWpcHiktl4KwMx0ql4ZaHSOnFG4o809OMNNAj8nYa KyrQ== X-Gm-Message-State: AA+aEWaYZQ0ubbtaA01NDa5hW/x7BA3qJRHseFWrUToRbPnhFre2+2CL xgAByj3PfzFoBTgTcgrg5rGo+Qz5 X-Google-Smtp-Source: AFSGD/Va4fspxp8UQi//gHy77btcdSatze277+SjhRwEM862IZufmlcj/c62bv7wfuBcL/CDlyMZ5w== X-Received: by 2002:a1c:9ed7:: with SMTP id h206mr10738624wme.28.1545309417536; Thu, 20 Dec 2018 04:36:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 20 Dec 2018 13:36:55 +0100 Message-Id: <20181220123655.30475-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220123655.30475-1-pbonzini@redhat.com> References: <20181220123655.30475-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a 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: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 | 4 +++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c index 9b43dc9ab4..14bd981336 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 089e268154..fe5eb304b1 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 06ca5068d8..8352612364 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 d937aff6b2..f32e0fbea2 100644 --- a/tests/test-crypto-pbkdf.c +++ b/tests/test-crypto-pbkdf.c @@ -440,6 +440,8 @@ int main(int argc, char **argv) #else int main(int argc, char **argv) { - return 0; + g_test_init(&argc, &argv, NULL); + g_test_skip(); + return g_test_run(); } #endif --=20 2.20.1