From: Alex Bennée <alex.bennee@linaro.org>
Date: Tue, 2 Feb 2021 13:39:48 +0000 (+0000)
Subject: tests/docker: make _copy_with_mkdir accept missing files
X-Git-Tag: qemu-xen-4.16.0-rc4~351^2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dffccf3d34467d7280212445e521f458d31ac6a2;p=qemu-xen.git

tests/docker: make _copy_with_mkdir accept missing files

Depending on the linker/ldd setup we might get a file with no path.
Typically this is the psuedo library linux-vdso.so which doesn't
actually exist on the disk. Rather than try and catch these distro
specific edge cases just shout about it and try and continue.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210202134001.25738-4-alex.bennee@linaro.org>
---

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 0b4f6167b3..fb3de41c0b 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -103,7 +103,12 @@ def _copy_with_mkdir(src, root_dir, sub_path='.'):
         pass
 
     dest_file = "%s/%s" % (dest_dir, os.path.basename(src))
-    copy(src, dest_file)
+
+    try:
+        copy(src, dest_file)
+    except FileNotFoundError:
+        print("Couldn't copy %s to %s" % (src, dest_file))
+        pass
 
 
 def _get_so_libs(executable):