From patchwork Mon May 17 16:09:54 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: 440144 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1230578jac; Mon, 17 May 2021 09:14:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKomEgouo+YOvYIQxIsMlodj3DA068hj4U6Vp0kn/3NxdSD+2SHfjagCsRQaD8aLvOzssr X-Received: by 2002:a2e:86cc:: with SMTP id n12mr130472ljj.457.1621268071173; Mon, 17 May 2021 09:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621268071; cv=none; d=google.com; s=arc-20160816; b=qE0nqxhmCBuznEbxfMBAhoxE/jSGNW1O32bHIIwJPYq1XF84bg8MyBrxlt0FZXue5U kqmkfKk6GXyOs/C/xjnhL6Wo9cOQteXIeyz4foktdT5sIXN9Whys1xy/gZWMXcVMBCOA K0nTtl9bvKZrwHgS3pverRE+K1Ds+GsqK38gaF/8fqaTD3VBZLp02Do5Bjcs7eoIftoc jw9a5RvH3zZL9ML7kKfEUdD5HaYmps8i7Azgm+0lNdIgoVrgq3emFO/lDGo8TRyGvnhM aSMCgeAC0g28Xrcq5ObSQPDDtYomgvnWHgzHpvQ6sz7j1eBPwqhmE9xZNxPE2/niB24O mTrA== 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=xSw+oi8MLoOzgRk09Ky3eK57lKOiggJ0N972/xwvHIQ=; b=dGOLA7yEHfQ4vxCQy9rFMJomtfRZjOGqYMZ8F9xxg0MobA5g3q1RzJl3vJ1etA4/vc Z9OeU/wMlXR45wHHtJ1C/DgY7I5NNU1l3TneQBNwRGO6ZygYaA9pEuxLv4YhiDubmaKp a3ghqgEs5ErVvBsVlmGYCbI/xKkA8BjIny0yJOGT8Jy/IawcNukjYItWBNaJdECelHiC 7bxQfwA6h3XJvK4agelEkMDute5yH9X9z+3G0N30lfeEh8dkQePnszfPeMCbddslms9O e2IatdxeO/+C9CZgdHx/raIDlHpKu/YeYDPJ1Bsz5tfYQqZ/ni1oWg6I8RUA/CBs2mAV CYKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JN1KAQLa; 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 o3si18089168lfr.406.2021.05.17.09.14.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 09:14:31 -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=JN1KAQLa; 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]:41184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lifsz-0005Sd-RZ for patch@linaro.org; Mon, 17 May 2021 12:14:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lifp8-0007GC-HN for qemu-devel@nongnu.org; Mon, 17 May 2021 12:10:30 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:43774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lifp5-0005q1-1N for qemu-devel@nongnu.org; Mon, 17 May 2021 12:10:30 -0400 Received: by mail-wm1-x32f.google.com with SMTP id b19-20020a05600c06d3b029014258a636e8so3929981wmn.2 for ; Mon, 17 May 2021 09:10:26 -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=xSw+oi8MLoOzgRk09Ky3eK57lKOiggJ0N972/xwvHIQ=; b=JN1KAQLaTNP151E9NIl4mWhbWmcj2ADi2gvAX9S/8hwKRM21YmgfMZ80G0oj/ky9X9 gfMKy/Ltewne+pZbftRWIEEVnsbQ25ahAbPLhitsp2i62WkVLkinVtkR5WVwaQkUga4s DVVVem52/MQgckqrXogbpvAYbZERwkOZbOEndm9tZaCMsTy/fRWjjm3kMe9zZfUCV53E SHEPRW1ZCkNWN2efbx+KwLgmuNhLRNsb+dTk/SrgEzH6WCAeWtj8z40Inaj140qR2qdP K1DGByfAYTSZNmmR4DFB9ZnBBfQnlbIlbcvp5Hk3ahgqyEp6+zoBrz/4KBtyyk3KebvN GhbQ== 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=xSw+oi8MLoOzgRk09Ky3eK57lKOiggJ0N972/xwvHIQ=; b=Jm5AWkekvY+SLXKUwZlK4DV1PCyR/ocobEP4aPPRkApfyBVWhOplAOz2LxrQCIFNUm hNGrNmXKjVyWW9h47kyIvgDiQy9OEmmTjVFRvC/jPgjBb8uCM4Qh3i6puqrYg+g3+AQq y5hRX2EurXEwUEF+jurCQ4yeiV3kRmjXD2UtKusD/4GcZ6ri4AAElOMwXE8OEtjGGlpc C7mdZu3U8Qns1YgyoWktOeSeM4ath4FQ1vNDcXirvaJt46voKZDzckPzFeE005DRkXIK OsyNo1JFGTGlxeX+L12hlLuVpXnUl7DiCwqZo1RFJY9yjSKWu2fFmDMl868WputKtcZa eXSQ== X-Gm-Message-State: AOAM531YJhH8ntqcUJnJdBhlRdfrqOkfahob1LJzJJOUPYcE9pUQpCTE 7inBiSFfQpnSDnb4p2nPCAGIXw== X-Received: by 2002:a7b:c091:: with SMTP id r17mr647836wmh.85.1621267825395; Mon, 17 May 2021 09:10:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o11sm3613813wrq.93.2021.05.17.09.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 09:10:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DB201FF87; Mon, 17 May 2021 17:10:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/29] tests/docker: fix copying of executable in "update" Date: Mon, 17 May 2021 17:09:54 +0100 Message-Id: <20210517161022.13984-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210517161022.13984-1-alex.bennee@linaro.org> References: <20210517161022.13984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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. Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Inspired-by: 5e33f7fead ("tests/docker: better handle symlinked libs") Message-Id: <20210512102051.12134-3-alex.bennee@linaro.org> -- 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()