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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3E177C433F5 for ; Thu, 26 May 2022 15:27:11 +0000 (UTC) Received: from localhost ([::1]:55096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuFOI-0005qc-5N for qemu-devel@archiver.kernel.org; Thu, 26 May 2022 11:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuFLE-0003HP-Ol for qemu-devel@nongnu.org; Thu, 26 May 2022 11:24:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuFLA-0004VK-H4 for qemu-devel@nongnu.org; Thu, 26 May 2022 11:24:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653578635; h=from:from:reply-to: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=xPyUr1kB1LdmEFKRI9MB62OdkYN28TaCHPu26ddZ2og=; b=cuBa6QVJh7JPaC1HNO1nCISCcUYgQtDzyDGt8uY2RkEEv8NGqxRHN02aZCDgy5ccvshqdZ UbDXri2CE1YgZoD19ADX5CKfUvGL7/cy9x8x3C1L9BAdmeyy4wqxww9rg1h3H85A8K0fhn 0eDrODY7/nHs3TPiwV37ngzihk+UhV8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-604-YdPEGSTtOLSMekDN8sLPeQ-1; Thu, 26 May 2022 11:23:53 -0400 X-MC-Unique: YdPEGSTtOLSMekDN8sLPeQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 66FD93C138B6; Thu, 26 May 2022 15:23:53 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 273D2492C3B; Thu, 26 May 2022 15:23:52 +0000 (UTC) Date: Thu, 26 May 2022 16:23:49 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: John Snow Cc: qemu-devel , Qemu-block , Kevin Wolf , Hanna Reitz , Paolo Bonzini Subject: Re: [PATCH] iotests: fix source directory location Message-ID: References: <20220526002512.1585246-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.2.1 (2022-02-19) X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, May 26, 2022 at 11:20:18AM -0400, John Snow wrote: > On Thu, May 26, 2022 at 10:21 AM John Snow wrote: > > > > > > > > On Thu, May 26, 2022, 3:54 AM Daniel P. Berrangé wrote: > >> > >> On Wed, May 25, 2022 at 08:25:12PM -0400, John Snow wrote: > >> > If you invoke the check script from outside of the tests/qemu-iotests > >> > directory, the directories initialized as source_iotests and > >> > build_iotests will be incorrect. > >> > > >> > We can use the location of the source file itself to be more accurate. > >> > > >> > Signed-off-by: John Snow > >> > Reviewed-by: Paolo Bonzini > >> > --- > >> > tests/qemu-iotests/testenv.py | 4 ++-- > >> > 1 file changed, 2 insertions(+), 2 deletions(-) > >> > > >> > diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py > >> > index a864c74b123..9b0f01e84db 100644 > >> > --- a/tests/qemu-iotests/testenv.py > >> > +++ b/tests/qemu-iotests/testenv.py > >> > @@ -217,10 +217,10 @@ def __init__(self, imgfmt: str, imgproto: str, aiomode: str, > >> > self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0])) > >> > else: > >> > # called from the source tree > >> > - self.source_iotests = os.getcwd() > >> > + self.source_iotests = str(Path(__file__, '..').resolve()) > >> > >> Path(__file__).parent > >> > >> > self.build_iotests = self.source_iotests > >> > > >> > - self.build_root = os.path.join(self.build_iotests, '..', '..') > >> > + self.build_root = str(Path(self.build_iotests, '../..').resolve()) > >> > >> Path(self.build_iotests).parent.parent > >> > >> to be portable > > > > > > With windows? I think Path() is meant to be a fully portable class as-is, but I'll double-check my assumption. I use ".." elsewhere in code already checked in, so if it's a problem I ought to fix it everywhere. > > Found a Windows box, it works there too. Good enough? I don't mind With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|