From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C437C433E2 for ; Mon, 14 Sep 2020 14:23:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E832420EDD for ; Mon, 14 Sep 2020 14:23:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bLrCjEXG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E832420EDD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHpO6-0007bo-UE for qemu-devel@archiver.kernel.org; Mon, 14 Sep 2020 10:23:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHpAb-0007Ck-L6 for qemu-devel@nongnu.org; Mon, 14 Sep 2020 10:09:25 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:26894 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 1kHpAZ-0007v6-32 for qemu-devel@nongnu.org; Mon, 14 Sep 2020 10:09:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600092561; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=quyCeD7qWnZ43Xs6VZhdeFmKn+iZ64j/BC+LheNLHBg=; b=bLrCjEXGyJ503/qdOqwCQYQ36NY3zNwX2xVdz+Zci4nVeJZSzfjFL2455G6bBafx9rz8Vi pWORmUBQssyGySVYkcPj72CDEw3q7Wh3il+JLCwd0Hi2H8xh0skDz0ptp2pfsiPX757SXf O9vSfl+Hn+95hnkFW5PLMtwsEjs6Fl0= 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-275-c84kKoNaPVGlPsA5zz0TBw-1; Mon, 14 Sep 2020 10:09:18 -0400 X-MC-Unique: c84kKoNaPVGlPsA5zz0TBw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BAB8764083; Mon, 14 Sep 2020 14:09:17 +0000 (UTC) Received: from dresden.str.redhat.com (ovpn-114-80.ams2.redhat.com [10.36.114.80]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3652B7A414; Mon, 14 Sep 2020 14:09:16 +0000 (UTC) Subject: Re: [PATCH] iotests: Work around failing readlink -f To: Peter Maydell References: <20200914113809.63640-1-mreitz@redhat.com> <450123b0-e56f-57c1-c42b-2618fcaefc77@redhat.com> From: Max Reitz Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: Date: Mon, 14 Sep 2020 16:09:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4eg2GWyRN3aLeAarbxATTfH27QaghmMkE" 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: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.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, NICE_REPLY_A=-0.001, 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 , =?UTF-8?Q?Alex_Benn=c3=a9e?= , QEMU Developers , Qemu-block Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --4eg2GWyRN3aLeAarbxATTfH27QaghmMkE Content-Type: multipart/mixed; boundary="dMVf0cQ5I8JBdQcR1ieWRSrQNFnQ1Yxqf" --dMVf0cQ5I8JBdQcR1ieWRSrQNFnQ1Yxqf Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 14.09.20 14:51, Peter Maydell wrote: > On Mon, 14 Sep 2020 at 13:32, Max Reitz wrote: >> >> On 14.09.20 14:31, Peter Maydell wrote: >>> On Mon, 14 Sep 2020 at 12:39, Max Reitz wrote: >>>> >>>> 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 wro= ng >>>> (with their system). >>>> >>>> Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f >>>> ("iotests: Allow running from different directory") >>>> Reported-by: Claudio Fontana >>>> Reported-by: Thomas Huth >>>> Signed-off-by: Max Reitz >>>> --- >>>> Hi Thomas, >>>> >>>> I thought this would be quicker than writing a witty response on wheth= er >>>> 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 "fai= led to enter source tree" >>>> build_iotests=3D$(readlink -f $(dirname "$0")) >>>> + if [ "$?" -ne 0 ]; then >>>> + # Perhaps -f is unsupported, revert to pre-b1cbc33a397 behavi= or >>>> + build_iotests=3D$PWD >>>> + fi >>>> else >>> >>> This still prints >>> readlink: illegal option -- f >>> usage: readlink [-n] [file ...] >>> >>> (you can see it in the build log that Thomas links to). >>> >>> build_iotests=3D$(readlink -f $(dirname "$0") 2>/dev/null) >>> >>> should avoid that, I think. >> >> I mentioned in the commit message that I find this useful and desirable >> behavior. Something isn=E2=80=99t working that perhaps users are expect= ing to >> work (because it will work on other systems), so I don=E2=80=99t think t= he error >> message should be suppressed. >=20 > I disagree. Either iotests can handle readlink not having '-f', > in which case it should not let readlink spew junk to the log, > or it can't, in which case it should bail out. I find this a bit complicated, because we can=E2=80=99t exactly handle read= link without -f. We can fall back to the old behavior on such systems, which I think is good enough and I assume you think, too. > If you want to tell the user something, you should catch the > failure and print something yourself, because then you can do > so with a message that will make sense to somebody trying to > run the test suite and point them in the direction of what > they can do to deal with the problem, eg something like > "readlink version doesn't support '-f'. Assuming that iotests > are being run from the build tree. If this isn't true then > we will fail later on: you can either run from the build tree, > or install a newer readlink." Doesn=E2=80=99t sound bad, it isn=E2=80=99t =E2=80=9Cbail out=E2=80=9D, tho= ugh, so I don=E2=80=99t fully understand how this relates to your paragraph above. (Because it seems like you suggest printing this unconditionally. I think it would be better to print it only if readlink -f failed, and then check finds $PWD isn=E2=80=99t $build_tree/tests/qemu-iotests. But...) > Printing "readlink: illegal option" is just going to cause > people to assume QEMU's scripts are broken and send us bug > reports, so please don't do that. (That=E2=80=99s absolutely true.) ...given everything, I think the best is then to indeed just suppress readlink=E2=80=99s error message. If readlink doesn=E2=80=99t work, and bu= ild_iotests defaults to $PWD, and $PWD is not the build tree, then you=E2=80=99ll end u= p with the six-year-old error message =E2=80=9C(make sure the qemu-iotests ar= e run from tests/qemu-iotests in the build tree)=E2=80=9D. Because doing so is probably easier anyway than trying to find a readlink that works. Max --dMVf0cQ5I8JBdQcR1ieWRSrQNFnQ1Yxqf-- --4eg2GWyRN3aLeAarbxATTfH27QaghmMkE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl9feYoACgkQ9AfbAGHV z0ArHAf8DMRXbZSmo+3F5yYmbgDLhACxjZRmTUHehQGQKInTktX7x5vZtCfdd3sl MViwZ0j/OTOlPlfOzdRHzkEvGr/6V/XFuMxyV10ZRp0nUySBAU8ZckZGtaIneshK q0N/9/da+0FMGpzyEBgpW34rCfuRnDhOI7HqLj3SJNdkbCai0lmUxTLedsfPKNrt Iq3O/7dhXPxJbsFXaFrsCAYJFFQkuN1/g0+wd51kzSXyS2DGQpzg3wNPi0wnixQ0 QhWg6raLm68Rm2fTuRnhR47Rs8QY7rsK5xdbvpTgQ6AXu/Km54J71qtivFNPm48I me8jbrN6SJEZDyfej47M3D7FOWdB8w== =1EkD -----END PGP SIGNATURE----- --4eg2GWyRN3aLeAarbxATTfH27QaghmMkE--