[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/30] tests/docker: fix copying of executable in "update"
From: |
Alex Bennée |
Subject: |
[PATCH v2 02/30] tests/docker: fix copying of executable in "update" |
Date: |
Tue, 4 May 2021 11:01:55 +0100 |
We have the same symlink chasing problem when doing an "update"
operation. Fix that.
Based-on: 5e33f7fead ("tests/docker: better handle symlinked libs")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
---
tests/docker/docker.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index d28df4c140..0435a55d10 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -548,7 +548,14 @@ def run(self, args, argv):
libs = _get_so_libs(args.executable)
if libs:
for l in libs:
- tmp_tar.add(os.path.realpath(l), arcname=l)
+ so_path = os.path.dirname(l)
+ name = os.path.basename(l)
+ real_l = os.path.realpath(l)
+ try:
+ tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name))
+ except FileNotFoundError:
+ print("Couldn't add %s/%s to archive" % (so_path, name))
+ pass
# Create a Docker buildfile
df = StringIO()
--
2.20.1
- [PATCH v2 00/30] testing/next (hexagon, tricore, ppc, signals, cirrus), Alex Bennée, 2021/05/04
- [PATCH v2 01/30] checkpatch: Fix use of uninitialized value, Alex Bennée, 2021/05/04
- [PATCH v2 02/30] tests/docker: fix copying of executable in "update",
Alex Bennée <=
- [PATCH v2 03/30] tests/docker: make executable an optional argument to "update", Alex Bennée, 2021/05/04
- [PATCH v2 04/30] tests/docker: allow "update" to add the current user, Alex Bennée, 2021/05/04
- [PATCH v2 05/30] tests/docker: add "fetch" sub-command, Alex Bennée, 2021/05/04
- [PATCH v2 08/30] gitlab: add build-user-hexagon test, Alex Bennée, 2021/05/04
- [PATCH v2 06/30] docker: Add Hexagon image, Alex Bennée, 2021/05/04
- [PATCH v2 11/30] tests/tcg: Add docker_as and docker_ld cmds, Alex Bennée, 2021/05/04
- [PATCH v2 07/30] tests/tcg: Use Hexagon Docker image, Alex Bennée, 2021/05/04
- [PATCH v2 10/30] tests/docker: Added libbpf library to the docker files., Alex Bennée, 2021/05/04
- [PATCH v2 09/30] tests/tcg: don't iterate through other arch compilers, Alex Bennée, 2021/05/04
- [PATCH v2 13/30] hw/tricore: Add testdevice for tests in tests/tcg/, Alex Bennée, 2021/05/04