From nobody Tue Feb 10 14:49:42 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502315985457455.2217233234086; Wed, 9 Aug 2017 14:59:45 -0700 (PDT) Received: from localhost ([::1]:50031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfZ0y-0005qi-8h for importer@patchew.org; Wed, 09 Aug 2017 17:59:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfYwj-0002Pw-SF for qemu-devel@nongnu.org; Wed, 09 Aug 2017 17:55:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfYwi-0006Tv-Dc for qemu-devel@nongnu.org; Wed, 09 Aug 2017 17:55:21 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dfYwi-0006TN-6a; Wed, 09 Aug 2017 17:55:20 -0400 Received: by mail-wr0-x242.google.com with SMTP id o33so5313658wrb.1; Wed, 09 Aug 2017 14:55:20 -0700 (PDT) Received: from donizetti.lan (94-39-192-75.adsl-ull.clienti.tiscali.it. [94.39.192.75]) by smtp.gmail.com with ESMTPSA id v41sm4390478wrc.65.2017.08.09.14.55.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2017 14:55:18 -0700 (PDT) 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; bh=Cz243I5HhA9+Zbz4UQLKGfL8soBShWPgsW1266ozHSY=; b=iZvU4kGNHvai1P+MnWHjzK3wRz2HRs9Rpn4yJW5+czAOa+9YdnzQwchcGss1PZNvs+ REq0TUiJU3BbOMGnNKmJWsz7GpAw2Dw4XNJ1Hjme5rpXIx2ggpd0qMNB0lC+iPdtY/+/ FRpNr/hZ9L7muxWdG4JCAwj4mjln4pjTmsEfVAsMBuHSOeLtqcu1quv9crzYf5WMfXZg FHQD+9dT9eGQVvThi6JQYHmUVQu4p64gGFqZ4iNbwfIyK0xjjDWnglyhQ9UmtguHPZLV eDzbAfp46J2YN3EMV0Uv7dt4pDDWHmkrlpliaxIq4X+R0e1UMxkUzOnXuuGTk6faDhXV fTKQ== 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; bh=Cz243I5HhA9+Zbz4UQLKGfL8soBShWPgsW1266ozHSY=; b=if+p3/PmPHXDalADkKl2CVypqdtfEbC3yI4HBRNoNNbUVZRLSsNbSJgaSOwOysbi7f fW7mAmY884TNlNgC6Sw+r7++78ncQx6MGnr2PB8drGZE3xSVSi9fZgFza0XdxfeFTB8I uamKCvDeF79UglGfloTp5ZO/YCNErInV5WrOGe7SnAI2AkVNDeGbv2QzrLPnuSW/d8JP 99C4i6DtEkGfZ+zbHd7a96Nl4rzn/DD7LdXfFESWsiSFWlczcz7tmBkvO5Rii5FKpbD4 xT31+Rk8iwIQZndCqJiuVp63P0bUtz4gry2v+0KB+2clHoRsvqx6XNUoNVsLg5/rFMKA 34Fw== X-Gm-Message-State: AHYfb5jVzwNVTFBBCJAzrdH+Q5whojRp8oafium+/NFvVCXSzwHGH+Cz Y+iiTnbcrkHMoq9RcMM= X-Received: by 10.223.161.19 with SMTP id o19mr7832003wro.235.1502315718913; Wed, 09 Aug 2017 14:55:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 9 Aug 2017 23:55:03 +0200 Message-Id: <20170809215510.22802-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170809215510.22802-1-pbonzini@redhat.com> References: <20170809215510.22802-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH 05/12] qemu-iotests: do not include common.rc in "check" 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: kwolf@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It only provides functions used by the test programs. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/check | 6 ------ tests/qemu-iotests/common.rc | 13 +++++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 5075029e89..1ef6d0ac3a 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -113,12 +113,6 @@ then _init_error "failed to source common.config" fi =20 -# we need common.rc -if ! . "$source_iotests/common.rc" -then - _init_error "failed to source common.rc" -fi - # we need common . "$source_iotests/common" =20 diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index ef5cdb3385..390aa81224 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -40,14 +40,11 @@ poke_file() printf "$3" | dd "of=3D$1" bs=3D1 "seek=3D$2" conv=3Dnotrunc &>/dev/nu= ll } =20 -# we need common.config -if [ "$iam" !=3D "check" ] -then - if ! . ./common.config - then - echo "$iam: failed to source common.config" - exit 1 - fi + +if ! . ./common.config + then + echo "$iam: failed to source common.config" + exit 1 fi =20 _fatal() --=20 2.13.3