qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	qemu-devel@nongnu.org,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Willian Rampazzo" <willianr@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL v2 01/29] tests/docker: fix copying of executable in "update"
Date: Tue, 18 May 2021 10:06:52 +0100	[thread overview]
Message-ID: <20210518090720.21915-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210518090720.21915-1-alex.bennee@linaro.org>

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>
Message-Id: <20210512102051.12134-3-alex.bennee@linaro.org>

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



  reply	other threads:[~2021-05-18  9:09 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-18  9:06 [PULL v2 00/29] testing and plugin updates Alex Bennée
2021-05-18  9:06 ` Alex Bennée [this message]
2021-05-18  9:06 ` [PULL v2 02/29] tests/docker: make executable an optional argument to "update" Alex Bennée
2021-05-18  9:06 ` [PULL v2 03/29] tests/docker: allow "update" to add the current user Alex Bennée
2021-05-18  9:06 ` [PULL v2 04/29] tests/docker: add "fetch" sub-command Alex Bennée
2021-05-18  9:06 ` [PULL v2 05/29] docker: Add Hexagon image Alex Bennée
2021-05-18  9:06 ` [PULL v2 06/29] tests/tcg: Use Hexagon Docker image Alex Bennée
2021-05-18  9:06 ` [PULL v2 07/29] gitlab: add build-user-hexagon test Alex Bennée
2021-05-18  9:06 ` [PULL v2 08/29] tests/tcg: don't iterate through other arch compilers Alex Bennée
2021-05-18  9:07 ` [PULL v2 09/29] tests/docker: Added libbpf library to the docker files Alex Bennée
2021-05-18  9:07 ` [PULL v2 10/29] tests/tcg: Add docker_as and docker_ld cmds Alex Bennée
2021-05-18  9:07 ` [PULL v2 11/29] tests/tcg: Run timeout cmds using --foreground Alex Bennée
2021-05-18  9:07 ` [PULL v2 12/29] hw/tricore: Add testdevice for tests in tests/tcg/ Alex Bennée
2021-05-18  9:07 ` [PULL v2 13/29] tests/tcg/tricore: Add build infrastructure Alex Bennée
2021-05-18  9:07 ` [PULL v2 14/29] configure: Emit HOST_CC to config-host.mak Alex Bennée
2021-05-18  9:07 ` [PULL v2 15/29] tests/tcg/tricore: Add macros to create tests and first test 'abs' Alex Bennée
2021-05-18  9:07 ` [PULL v2 16/29] tests/tcg/tricore: Add bmerge test Alex Bennée
2021-05-18  9:07 ` [PULL v2 17/29] tests/tcg/tricore: Add clz test Alex Bennée
2021-05-18  9:07 ` [PULL v2 18/29] tests/tcg/tricore: Add dvstep test Alex Bennée
2021-05-18  9:07 ` [PULL v2 19/29] tests/tcg/tricore: Add fadd test Alex Bennée
2021-05-18  9:07 ` [PULL v2 20/29] tests/tcg/tricore: Add fmul test Alex Bennée
2021-05-18  9:07 ` [PULL v2 21/29] tests/tcg/tricore: Add ftoi test Alex Bennée
2021-05-18  9:07 ` [PULL v2 22/29] tests/tcg/tricore: Add madd test Alex Bennée
2021-05-18  9:07 ` [PULL v2 23/29] tests/tcg/tricore: Add msub test Alex Bennée
2021-05-18  9:07 ` [PULL v2 24/29] tests/tcg/tricore: Add muls test Alex Bennée
2021-05-18  9:07 ` [PULL v2 25/29] tests/docker: gcc-10 based images for ppc64{, le} tests Alex Bennée
2021-05-18  9:07 ` [PULL v2 26/29] tests/tcg/ppc64le: tests for brh/brw/brd Alex Bennée
2021-05-18  9:07 ` [PULL v2 27/29] tests/tcg: fix missing return Alex Bennée
2021-05-18  9:07 ` [PULL v2 28/29] tests/tcg: don't allow clang as a cross compiler Alex Bennée
2021-05-18  9:07 ` [PULL v2 29/29] configure: use cc, not host_cc to set cross_cc for build arch Alex Bennée
2021-05-18  9:58 ` [PULL v2 00/29] testing and plugin updates no-reply
2021-05-19 15:09 ` Peter Maydell
2021-05-19 15:26   ` Alex Bennée
2021-05-19 17:19   ` Alex Bennée
2021-05-20 11:09 ` Peter Maydell

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=20210518090720.21915-2-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=willianr@redhat.com \
    /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).