From patchwork Wed May 12 10:20:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 435474 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4685689jao; Wed, 12 May 2021 03:21:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMjlg5fikmxY8XtQFRW1FEAMMznD/TeYfgkF5TUMkDa6Mdn4xytKMpf9OZdIHT7znAiF6a X-Received: by 2002:a1f:dbc7:: with SMTP id s190mr27644464vkg.12.1620814872721; Wed, 12 May 2021 03:21:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620814872; cv=none; d=google.com; s=arc-20160816; b=cXWKYtw7XNQh3NteAkXjZf1oV1DuUfJX49qhnkKDW/ctucVw7or7fcFq2Ufh2FJSoB qMdBp/vqDgs3s6K49k0z2G0MmUAdMRjJZb5Nzf3ZXpLHt1lBmaT+aG7yhjrcai/x3zhl qcwdLCCE5uzIwPP7n6GD20Ow48R29z9Alo26y4AecEHoEtEFgbkTR1OKkCVK1qlVjMfJ 4ycqJts97V2ipbKwmNQtK1+GgvPXXB/Ea6uCBnRxz97TRmQLAVvT52GQ8hC+L1A+e2ZP ifjCUr4a7ogJ+6Nd89e7EkV7f90hTHFUFG+ZOlh+SAq0IHHUtKoXtZQxJBS2rSOjOmwJ 6+DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=TuKozATKQ3Td5Fp2Tf/kZG/QQ+gsJcItcXeBYs6um/I=; b=ajr27GVEciueFotFGrbaV2TLh5H39g1eQAcezCpBGjZ9FvQjpUmXPtRtwYnk3H0iEP Or6Z9gKko2TQTVUniHi5+NM+8wmLAidKu3Yqcq42hsVKqvoQE9HdzaWGCncddjCREBfk PeJmImm3oe6UMQlG+L3unIblCRI2rmLfL9Gt5H3QZv2XkuWeTX2x5o6hz3+e6xcKE/MB hQedoxyIjsQUKZ2OtIF8Sr9ZvCeDPFG/jAjMqpIC1Xpe5LPrBXUBvR6JM+rJbST9Xn5K k6JH+RofmasfJqemkN7OmAxMPULupEh9U7Fv6RR0OPHEzo+AvAVxf25PWVH4lkF8V637 iw2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P8NWa9iW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o15si4457501vsh.377.2021.05.12.03.21.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 May 2021 03:21:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P8NWa9iW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lglzM-0003CB-29 for patch@linaro.org; Wed, 12 May 2021 06:21:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lglz9-0003AH-BN for qemu-devel@nongnu.org; Wed, 12 May 2021 06:20:59 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lglz7-0003UX-Od for qemu-devel@nongnu.org; Wed, 12 May 2021 06:20:59 -0400 Received: by mail-wm1-x331.google.com with SMTP id n84so12680387wma.0 for ; Wed, 12 May 2021 03:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TuKozATKQ3Td5Fp2Tf/kZG/QQ+gsJcItcXeBYs6um/I=; b=P8NWa9iW7iSICPcPLN8NbQKUvf/P6CJjrr8J9hvWxkWGzwmjPl9/shVssgGC7GUn5B PoByOPkDfEIIpZaItBcVHiKJMYSAdInP0vLZcQrzv9coRbsgAEbSwYxFN0/GES+YL1dS Dy28KoVu87eSsKX6NYikD5F0k7J01SC7PnLFuIX4FblrhcAFrLBGKOEZtPMAl3x7PdbH I0K7f/XneYl28jHtKXDGa1IZoTAPrqfD2MZWFLTNwHUq4RBGdl8swtF5knIb0/HK014c lGVPk1E2YhakSTy6+c9C3qj4nf/PFmTG0g1bYZ+t7dB5QME6NGotuV/7oxvd1OrQiE1M J/HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TuKozATKQ3Td5Fp2Tf/kZG/QQ+gsJcItcXeBYs6um/I=; b=Z0SO+BUIZQEOtW/26Eo7kLKOVCWDfoVMMdbkBNwuObSRLBb6eekqSWmEiBxen/CdPt 6+Ua3lOWXV/FzsaxLaju4Cq5dTwoQXBmM5zDvGqgEvvXly1GSVIyItDb5VNIRfmnsaTy KfFgIXRoUbINkjCJhvKAL6wsupfpogIK5RCCIFMRd2Z8ZO0Btm7qAJbi48MCgJlpNobM ib21B8LQwtlhgo7R8lI/gt2eSjASkEHO6p6+u3DwzM0hM4c56WKRT1C6KMmA9CeoW2dj jbF/UJ0rz3mbCl3gNJ0eccnJe9YHxtMrMJ6uCO4Vj0KfhbRJR+hIbZCo1FE2ZGode5i3 oxfg== X-Gm-Message-State: AOAM532urphXZ+fI8zvefP2ozaugZm+cLxKnoJFrAXuOIR5IqpVV30JN 7yoD8sRsbcg60bpW6mVR5TTDaA== X-Received: by 2002:a1c:750b:: with SMTP id o11mr10791629wmc.188.1620814856275; Wed, 12 May 2021 03:20:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f1sm3350739wrr.63.2021.05.12.03.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 03:20:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4FB4A1FF8C; Wed, 12 May 2021 11:20:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 02/31] tests/docker: fix copying of executable in "update" Date: Wed, 12 May 2021 11:20:22 +0100 Message-Id: <20210512102051.12134-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210512102051.12134-1-alex.bennee@linaro.org> References: <20210512102051.12134-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Willian Rampazzo --- tests/docker/docker.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.20.1 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()