From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v1 3/6] tests/docker: make _copy_with_mkdir accept missing files
Date: Tue, 19 Jan 2021 17:52:04 +0000 [thread overview]
Message-ID: <20210119175208.763-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210119175208.763-1-alex.bennee@linaro.org>
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>
---
tests/docker/docker.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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):
--
2.20.1
next prev parent reply other threads:[~2021-01-19 19:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 17:52 [PATCH v1 0/6] testing/next (docker binfmt tests) Alex Bennée
2021-01-19 17:52 ` [PATCH v1 1/6] tests/docker: Fix _get_so_libs() for docker-binfmt-image Alex Bennée
2021-01-19 17:52 ` [PATCH v1 2/6] tests/docker: Fix typo in help message Alex Bennée
2021-01-19 17:52 ` Alex Bennée [this message]
2021-01-19 18:56 ` [PATCH v1 3/6] tests/docker: make _copy_with_mkdir accept missing files Philippe Mathieu-Daudé
2021-01-19 17:52 ` [PATCH v1 4/6] tests/docker: preserve original name when copying libs Alex Bennée
2021-01-19 17:52 ` [PATCH v1 5/6] tests/docker: alias docker-help target for consistency Alex Bennée
2021-01-19 17:52 ` [PATCH v1 6/6] tests/docker: add a docker-exec-copy-test Alex Bennée
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=20210119175208.763-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=philmd@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).