]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
meson: fix relpath failure on Win32
authorYonggang Luo <luoyonggang@gmail.com>
Wed, 26 Aug 2020 15:10:02 +0000 (23:10 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 27 Aug 2020 16:52:30 +0000 (18:52 +0200)
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

index bdb257bbd917c942d03b7eb62579f468f7d64912..d7a51bf97ea42466f3a4940631dc84976d17d97f 100644 (file)
@@ -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'])))