From: luoyonggang@gmail.com
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail.
Date: Tue, 25 Aug 2020 16:34:57 +0800 [thread overview]
Message-ID: <20200825083500.359-2-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200825083500.359-1-luoyonggang@gmail.com>
From: Yonggang Luo <luoyonggang@gmail.com>
---
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 8:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 8:34 [PATCH 1/5] meson: SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched. if the path are start with C:/ and E:/ luoyonggang
2020-08-25 8:34 ` luoyonggang [this message]
2020-08-25 9:04 ` [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail Daniel P. Berrangé
2020-08-25 8:34 ` [PATCH 3/5] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
2020-08-25 8:34 ` [PATCH 4/5] meson: !/bin/sh are msys2 friendly luoyonggang
2020-08-25 8:59 ` Daniel P. Berrangé
2020-08-25 9:11 ` 罗勇刚(Yonggang Luo)
2020-08-25 13:59 ` Eric Blake
2020-08-25 14:21 ` 罗勇刚(Yonggang Luo)
2020-08-25 8:35 ` [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly luoyonggang
2020-08-25 9:04 ` Daniel P. Berrangé
2020-08-25 9:05 ` [PATCH 1/5] meson: SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched. if the path are start with C:/ and E:/ Daniel P. Berrangé
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=20200825083500.359-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).