qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Yonggang Luo <luoyonggang@gmail.com>
Subject: [PULL 14/17] meson: fix relpath failure on Win32
Date: Thu, 27 Aug 2020 12:59:53 -0400	[thread overview]
Message-ID: <20200827165956.12925-15-pbonzini@redhat.com> (raw)
In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com>

From: Yonggang Luo <luoyonggang@gmail.com>

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 <luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.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.26.2




  parent reply	other threads:[~2020-08-27 17:06 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-27 16:59 [PULL 00/17] Meson fixes for 2020-08-27 Paolo Bonzini
2020-08-27 16:59 ` [PULL 01/17] trace: fix creation of systemtap files Paolo Bonzini
2020-08-27 16:59 ` [PULL 02/17] meson: Build qemu-nbd on macOS again Paolo Bonzini
2020-08-27 18:06   ` Thomas Huth
2020-08-27 20:00     ` Eric Blake
2020-08-27 20:46       ` Paolo Bonzini
2020-08-27 16:59 ` [PULL 03/17] meson: Don't make object files for dtrace on macOS Paolo Bonzini
2020-08-27 16:59 ` [PULL 04/17] scripts/qemu-version.sh: Add missing space before ']' Paolo Bonzini
2020-08-27 16:59 ` [PULL 05/17] meson: Fix meson build with --enable-libdaxctl Paolo Bonzini
2020-08-27 16:59 ` [PULL 06/17] meson: Fix chardev-baum.so name Paolo Bonzini
2020-08-27 16:59 ` [PULL 07/17] configure: default to PIE disabled on Windows platforms Paolo Bonzini
2020-08-27 16:59 ` [PULL 08/17] meson: move pixman detection to meson Paolo Bonzini
2020-08-27 16:59 ` [PULL 09/17] meson: skip SDL2 detection if --disable-system Paolo Bonzini
2020-08-27 16:59 ` [PULL 10/17] configure: add --ninja option Paolo Bonzini
2020-08-27 16:59 ` [PULL 11/17] meson: cleanup xkbcommon detection Paolo Bonzini
2020-08-27 16:59 ` [PULL 12/17] meson: don't require CONFIG_VTE for the GTK UI Paolo Bonzini
2020-08-27 16:59 ` [PULL 13/17] ninjatool: quote dollars in variables Paolo Bonzini
2020-08-27 16:59 ` Paolo Bonzini [this message]
2020-08-27 16:59 ` [PULL 15/17] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Paolo Bonzini
2020-08-27 16:59 ` [PULL 16/17] meson: set colorout to auto Paolo Bonzini
2020-08-27 16:59 ` [PULL 17/17] ninjatool: Fixes E$$: in generated Makefile.ninja Paolo Bonzini
2020-08-28 10:04 ` [PULL 00/17] Meson fixes for 2020-08-27 Peter Maydell

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=20200827165956.12925-15-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=luoyonggang@gmail.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).