From nobody Fri May 3 11:58:58 2024 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=1600083548; cv=none; d=zohomail.com; s=zohoarc; b=bYvofhyPrvE/Se5aRsOhmHmy+uVgZcgqbf9UAlIKJAJe6MlExYpeLc8RbD0v2eT4iWNQkqFz6UHOAf18H5e3fx73EZItQxcU9BEnZZl914Itaet++I5FS8SLXSD7Mazv0zGPaNCkZK4OKLYxKDv9kt4pSqbg+ZjS0p4fRoS4Rrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600083548; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=2i9ZjR5CG4NvOolwpPQRKkGo4Mxm85LqFUH7MDl/wNA=; b=cULPXAyXUZq+HlYLL24Ol15BdeWslVw0VKkB+npI+HAx+x8u3m/ruHcBBVy8dUFqo07+6qx7T1W1144u3tS8ght+TwWQrr9KGv9IkrZR923p6lldlN7YTCBUY9ZD/5CKkYmEQMtH1nOfBaFJFUCavH3TGEuByDKQXCfSp/kC/s8= 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 160008354892752.86168927617928; Mon, 14 Sep 2020 04:39:08 -0700 (PDT) Received: from localhost ([::1]:52486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHmp9-0000U1-O5 for importer@patchew.org; Mon, 14 Sep 2020 07:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHmoM-0008EG-QA for qemu-devel@nongnu.org; Mon, 14 Sep 2020 07:38:18 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:40787 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kHmoL-0001ae-3U for qemu-devel@nongnu.org; Mon, 14 Sep 2020 07:38:18 -0400 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-189-6_dxEqHHMFe2mJMguUnpwg-1; Mon, 14 Sep 2020 07:38:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10DC28030CD; Mon, 14 Sep 2020 11:38:12 +0000 (UTC) Received: from localhost (ovpn-114-80.ams2.redhat.com [10.36.114.80]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E54360BE2; Mon, 14 Sep 2020 11:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600083495; 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; bh=2i9ZjR5CG4NvOolwpPQRKkGo4Mxm85LqFUH7MDl/wNA=; b=eWYlaH7pXdBRdUnOa5MP+e1olpBzuYYkmclSD9GfPZgti3oVCCxcCZwFM9vkRcTmKvHlJE TJb1IqEyymS6Re6+OE9NuXzQUvfFHz+4L9OpVUPpaTGcS+P/iDeF2MLT1F1zpcqy88hCaU xHzV0Ol7O9NzDMgsgrglYNfSkaVhKAs= X-MC-Unique: 6_dxEqHHMFe2mJMguUnpwg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH] iotests: Work around failing readlink -f Date: Mon, 14 Sep 2020 13:38:09 +0200 Message-Id: <20200914113809.63640-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=207.211.31.81; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 00:11:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HEXHASH_WORD=1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , Thomas Huth , qemu-devel@nongnu.org, Max Reitz 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" On macOS, (out of the box) readlink does not have -f. If the recent "readlink -f" call introduced by b1cbc33a397 fails, just fall back to the old behavior (which means you can run the iotests only from the build tree, but that worked fine for six years, so it should be fine still). Keep any potential error message on stderr. If users want to run the iotests from outside the build tree, this may point them to what's wrong (with their system). Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f ("iotests: Allow running from different directory") Reported-by: Claudio Fontana Reported-by: Thomas Huth Signed-off-by: Max Reitz Tested-by: Thomas Huth --- Hi Thomas, I thought this would be quicker than writing a witty response on whether you or me should write this patch. O:) --- tests/qemu-iotests/check | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index e14a1f354d..75675e1a18 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -45,6 +45,10 @@ then fi source_iotests=3D$(cd "$source_iotests"; pwd) || _init_error "failed t= o enter source tree" build_iotests=3D$(readlink -f $(dirname "$0")) + if [ "$?" -ne 0 ]; then + # Perhaps -f is unsupported, revert to pre-b1cbc33a397 behavior + build_iotests=3D$PWD + fi else # called from the source tree source_iotests=3D$PWD --=20 2.26.2