[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files
From: |
Alex Bennée |
Subject: |
[PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files |
Date: |
Mon, 8 Feb 2021 12:38:09 +0000 |
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):
--
2.20.1
- [PULL 00/16] testing, gdbstub and doc tweaks, Alex Bennée, 2021/02/08
- [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image, Alex Bennée, 2021/02/08
- [PULL 05/16] tests/docker: preserve original name when copying libs, Alex Bennée, 2021/02/08
- [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv, Alex Bennée, 2021/02/08
- [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files,
Alex Bennée <=
- [PULL 08/16] configure: make version_ge more tolerant of shady version input, Alex Bennée, 2021/02/08
- [PULL 03/16] tests/docker: Fix typo in help message, Alex Bennée, 2021/02/08
- [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS), Alex Bennée, 2021/02/08
- [PULL 07/16] tests/docker: add a docker-exec-copy-test, Alex Bennée, 2021/02/08
- [PULL 06/16] tests/docker: alias docker-help target for consistency, Alex Bennée, 2021/02/08
- [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it, Alex Bennée, 2021/02/08
- [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests, Alex Bennée, 2021/02/08
- [PULL 10/16] tests/tcg: don't silently skip the gdb tests, Alex Bennée, 2021/02/08
- [PULL 09/16] configure: bump the minimum gdb version for check-tcg to 9.1, Alex Bennée, 2021/02/08
- [PULL 15/16] docs/system: document an example vexpress-a15 invocation, Alex Bennée, 2021/02/08