From nobody Wed Dec 17 08:50:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612443400; cv=none; d=zohomail.com; s=zohoarc; b=oCDlD2wwGPljNi1UrOmnhnbpeS1nqKtd2YVYz1oXJAC4Ri8kjpSg1FXyRmd3md3HxcooLlgf5pUh46uwV/9689Dq56KK6HLmGptEOVPHXErTpY1xOYmyTw11+sBZZeSn1MPoqO9HEgXrbzz8njVPw3dh38kKv+ne6ruYC720pAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612443400; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KsdQp7xWBxq/WitskmLhyzNYl49F08L0Po89vGjjpuY=; b=ZBN/CH7oTgy4CM9eCmQoCWqFZ5PmtMk1EWJcZClg4/G8H+fWv56Ais+m6voISWKmris0OqwshqZ6GNEs1sTTrZcg5jpJP6VAJ4Hch2ry8hmyjR9OVsIICPzKLXb2MlTb4cmpCyDNCOKWWIfhDx80DXGrDlgoSAfCzKPBGTlFBbQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612443400447727.6652034787371; Thu, 4 Feb 2021 04:56:40 -0800 (PST) Received: from localhost ([::1]:58068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7eBb-0001O7-5g for importer@patchew.org; Thu, 04 Feb 2021 07:56:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7e4o-00022w-1R for qemu-devel@nongnu.org; Thu, 04 Feb 2021 07:49:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7e4m-0001wW-Mv for qemu-devel@nongnu.org; Thu, 04 Feb 2021 07:49:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-55-4n9BvqEdPrKGKOyFdiP29w-1; Thu, 04 Feb 2021 07:49:32 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78486100CCC2; Thu, 4 Feb 2021 12:49:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-169.ams2.redhat.com [10.36.115.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47BE32BFE2; Thu, 4 Feb 2021 12:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612442976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KsdQp7xWBxq/WitskmLhyzNYl49F08L0Po89vGjjpuY=; b=J8JTflYz4I9Udp6RwIaqmBzaJn9J0YqkFmlzSp784+Mck/cgyOug7iovcB1J1JksyIuwOd M4sdhQ0ida0+x3U3WFr0IkumfBkiFhSDINYz0xzuMW5/eqbqO0V9FhfRObglQFtjvSwuCY kZ1GLogI/ZxN0LhKiSQ7Utvm+AIIgPM= X-MC-Unique: 4n9BvqEdPrKGKOyFdiP29w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v11 11/12] iotests: fix loading of common.config from tests/ subdir Date: Thu, 4 Feb 2021 12:48:33 +0000 Message-Id: <20210204124834.774401-12-berrange@redhat.com> In-Reply-To: <20210204124834.774401-1-berrange@redhat.com> References: <20210204124834.774401-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Juan Quintela , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , "Dr. David Alan Gilbert" , Pavel Dovgalyuk , Paolo Bonzini , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) common.rc assumes it is being sourced from the same directory and so also tries to source common.config from the current working directory. With the ability to now have named tests in the tests/ subdir we need to check two locations for common.config. Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/qemu-iotests/common.rc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 297acf9b6a..77c37e8312 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -109,8 +109,14 @@ peek_file_raw() dd if=3D"$1" bs=3D1 skip=3D"$2" count=3D"$3" status=3Dnone } =20 - -if ! . ./common.config +config=3Dcommon.config +test -f $config || config=3D../common.config +if ! test -f $config +then + echo "$0: failed to find common.config" + exit 1 +fi +if ! . $config then echo "$0: failed to source common.config" exit 1 --=20 2.29.2