From nobody Sun Nov 16 05:42:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598548020; cv=none; d=zohomail.com; s=zohoarc; b=ZFI7OD6UN6n7oBYP0Aykhb2peB0sPe15K0+1NyqdZRAmxeEGbRGrnWL6/HYIJI0y9/ylyWIHI9w0buJp3E1N+OTq0wOCfaGJuZlJ+jHs5XjTp40rTr8lzRZtQEsGdbFowOJ6UulFE3lX5xG5eM3EOupEicfGBqTGnoWluTOXSes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548020; 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=Aki3Qo0pxFtN0AobNIq1SGsWqCNa8JRiNsFzMRNgv5Q=; b=dc4EYpPBSMM2nPHjIGLD1v8LEm2BmDSmSf4hORzu7ZDXs2fqsMoEOAwGdh9rJpd+c9e8F0D8yguHjIHGocatvKfkgZDSt+MJLJbmLcs+U4DOR5HeT6K8jP+5OfMIXDEnbuWWN04iE42o5D/qPICMJLyWB0LdJZirUt32bzi8mkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598548020194738.9321203421616; Thu, 27 Aug 2020 10:07:00 -0700 (PDT) Received: from localhost ([::1]:33534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLMZ-0000gr-0Z for importer@patchew.org; Thu, 27 Aug 2020 13:06:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGP-0006Ne-Od for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36717 helo=us-smtp-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 1kBLGK-0005Ww-4R for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:37 -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-246-6rX5rXYhOVyEDN3gwKNiAQ-1; Thu, 27 Aug 2020 13:00:26 -0400 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 AB0C2107464F; Thu, 27 Aug 2020 17:00:25 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60BAB50B3F; Thu, 27 Aug 2020 17:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547630; 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=Aki3Qo0pxFtN0AobNIq1SGsWqCNa8JRiNsFzMRNgv5Q=; b=UKstlpaX1z3nkNan7dwV9Rc+CUfuM4HO7nZG5AcncY3x9BTP5QR2OfrdcAb/sp4uoPrAdp uC4y2ySthVmCoksx90Qy3QpEK3c6C4zDC4IZ45HESnAevO1a/ja8NzX9fs0yfs6p/1dErg LkurPA15fS23t3U3ZCPEP9xtq0imQ/M= X-MC-Unique: 6rX5rXYhOVyEDN3gwKNiAQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/17] meson: fix relpath failure on Win32 Date: Thu, 27 Aug 2020 12:59:53 -0400 Message-Id: <20200827165956.12925-15-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.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: Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo On win32, os.path.relpath can raise an exception when computing for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build. Use try...except to avoid this, just using an absolute path in this case. Signed-off-by: Yonggang Luo Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index bdb257bbd9..d7a51bf97e 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -53,9 +53,16 @@ i =3D 0 for test in json.load(sys.stdin): env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) - executable =3D os.path.relpath(test['cmd'][0]) + executable =3D test['cmd'][0] + try: + executable =3D os.path.relpath(executable) + except: + pass if test['workdir'] is not None: - test['cmd'][0] =3D os.path.relpath(test['cmd'][0], test['workdir']) + try: + test['cmd'][0] =3D os.path.relpath(executable, test['workdir']) + except: + test['cmd'][0] =3D executable else: test['cmd'][0] =3D executable cmd =3D '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in= test['cmd']))) --=20 2.26.2