From: luoyonggang@gmail.com
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH 2/4] meson: fixes relpath may fail on win32.
Date: Tue, 25 Aug 2020 22:51:31 +0800 [thread overview]
Message-ID: <20200825145133.178-2-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200825145133.178-1-luoyonggang@gmail.com>
From: Yonggang Luo <luoyonggang@gmail.com>
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
---
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'])))
--
2.27.0.windows.1
next prev parent reply other threads:[~2020-08-25 14:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 14:51 [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja luoyonggang
2020-08-25 14:51 ` luoyonggang [this message]
2020-08-25 14:51 ` [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
2020-08-25 14:51 ` [PATCH 4/4] configure: Fix include and linkage issue on msys2 luoyonggang
-- strict thread matches above, loose matches on Subject: below --
2020-08-25 16:53 [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja luoyonggang
2020-08-25 16:53 ` [PATCH 2/4] meson: fixes relpath may fail on win32 luoyonggang
2020-08-25 21:31 ` Mark Cave-Ayland
2020-08-26 6:46 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200825145133.178-2-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).