From patchwork Thu May 26 00:25:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 12861894 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 D5E7DC433F5 for ; Thu, 26 May 2022 00:27:04 +0000 (UTC) Received: from localhost ([::1]:34724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nu1LE-0005t0-1t for qemu-devel@archiver.kernel.org; Wed, 25 May 2022 20:27:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nu1JY-0004xJ-6X for qemu-devel@nongnu.org; Wed, 25 May 2022 20:25:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nu1JV-0005Ug-Ja for qemu-devel@nongnu.org; Wed, 25 May 2022 20:25:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653524716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ROJ7Vtb1e5CbwXyeaaS5m4K5oh9HSdMJVOulsAi+r4w=; b=bWKLFFu5fjoVEpyL27IQebxAxy3cZbHN1e/RdwHRMXCu2k94nTLgqb6jfhfihVB7hydJH5 M/HPzfU2S6ZEajvTsnlWOK9XVbzAayM7ofiJAzG2uXCuDRE1GpkEll22woZTBM2NJWPltU 8IKFCqh5FMWBRVG45mrRnodY+T8AAWk= 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-347-zT2SH-2EPr6CkEZ4dKaYOg-1; Wed, 25 May 2022 20:25:13 -0400 X-MC-Unique: zT2SH-2EPr6CkEZ4dKaYOg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD9A53810D2D; Thu, 26 May 2022 00:25:12 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 988C32166B26; Thu, 26 May 2022 00:25:12 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf , Hanna Reitz , John Snow , Paolo Bonzini Subject: [PATCH] iotests: fix source directory location Date: Wed, 25 May 2022 20:25:12 -0400 Message-Id: <20220526002512.1585246-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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()) self.build_iotests = self.source_iotests - self.build_root = os.path.join(self.build_iotests, '..', '..') + self.build_root = str(Path(self.build_iotests, '../..').resolve()) self.init_directories() self.init_binaries()