From patchwork Wed Aug 26 11:30:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 275516 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=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 9EDD8C433E1 for ; Wed, 26 Aug 2020 11:32:34 +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 6D49C2087C for ; Wed, 26 Aug 2020 11:32:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LTQh4k8V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D49C2087C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtfN-0000T0-La for qemu-devel@archiver.kernel.org; Wed, 26 Aug 2020 07:32:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtdz-0007Mc-Am for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:31:07 -0400 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:53651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtdx-0006W2-J0 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:31:07 -0400 Received: by mail-pj1-x1044.google.com with SMTP id nv17so745877pjb.3 for ; Wed, 26 Aug 2020 04:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=LTQh4k8VkHZ/Pg39TQPw/ZeyU4MGo/oicMvXfR25w99kOLng1t0ZgpTnyZATIjTaBw uG7ktqyHmky/F3c6dz5PjjS5IkIo2oYAsSK6WEbxcT0v5Ntn2PPTFPnOiim2MQsX836B +QPoe0V4aZXsnl0WEqxZ6a5Al+LO3IC6lVT9w4uHFrCpqy5N5dYoMyYoo644t0jQ3xNm y/U+7MNmzVI3l36Qpb445IKOZf9+0dQ0Y4NNPhmytE9FrRGQUD0nVFxuPrLkXlo3aFzb Tqpa72c3HDophOQknCVkavodJc3hFVyiSeOK3Sg2lxNZScu8WmUo9dj9vhh238O9/vhJ iN4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=R/pUMgGfYnIHZb4aQHCCSsMcc9olmrimi2Nwe1szzJWEHEo6XtL/ftcZwA4UEwAClZ ile3Vp0GdSz0nHleCbHKDyCY8omof4YSbLcpQnaB56+sEn1TK7F+ZraHjgZOT/xxUzC9 bVl7+nXYxI1/E2W+Qn9CG9BIp6tHToWXPJ6ohhsQW2rxc0YQocE+JZGHlgmtvsqephqN JAJwq4u5rH+npoCjXj9SBSIrPAXBjjEjgYpbBeFS5O0RpTYvXM7ZZrrOMzZnBqEsBxVR nsFF34ayF0eOjtECbt6FjpTeR3w/cVepyim0r31fIylqG5BRhb0mKC7GTCbdDl4rwjna r9Ng== X-Gm-Message-State: AOAM531EzUAmd+jBUAK4rlrHl+8gXK5xEyr0RfQLfRqqilH7xHpe5SM1 GkNdIgR3chq8SjqpEJ1qkAf4tnQpe0biG/ix X-Google-Smtp-Source: ABdhPJyebO2W0shal5a4Gt59gzJgBNLJw+ynb/70/X/Tht9ODmQ5LTyHdoork/uVctZNY058xGRUrA== X-Received: by 2002:a17:90a:5282:: with SMTP id w2mr5832010pjh.77.1598441463526; Wed, 26 Aug 2020 04:31:03 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id v8sm2310878pju.1.2020.08.26.04.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:31:02 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [[PATCH v3] 2/5] meson: fixes relpath may fail on win32. Date: Wed, 26 Aug 2020 19:30:32 +0800 Message-Id: <20200826113035.1564-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200826113035.1564-1-luoyonggang@gmail.com> References: <20200826113035.1564-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1044; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1044.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo On win32, os.path.relpath would raise exception when do the following relpath: C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. So we try catch it for stopping it from raise exception on msys2 Signed-off-by: Yonggang Luo --- 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 = 0 for test in json.load(sys.stdin): env = ' '.join(('%s=%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) - executable = os.path.relpath(test['cmd'][0]) + executable = test['cmd'][0] + try: + executable = os.path.relpath(executable) + except: + pass if test['workdir'] is not None: - test['cmd'][0] = os.path.relpath(test['cmd'][0], test['workdir']) + try: + test['cmd'][0] = os.path.relpath(executable, test['workdir']) + except: + test['cmd'][0] = executable else: test['cmd'][0] = executable cmd = '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in test['cmd'])))