From patchwork Fri Jan 22 18:18:49 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: 368658 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1749550jam; Fri, 22 Jan 2021 10:24:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8pqEbaePvW5faRxTF4uU1asebc941sCqa8L8f64VCKEzEt+0lvF/DxXmyCUDrze8+CEPH X-Received: by 2002:a25:5ed7:: with SMTP id s206mr3013863ybb.99.1611339896753; Fri, 22 Jan 2021 10:24:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339896; cv=none; d=google.com; s=arc-20160816; b=UNg+0jSmmADTKwqBAQna98CNcpZLc2IBAI9tuxr/neQodiF+h08++QptOPWoO5nmxB KNx1FgZ44ZV6n8FzExTMdd6eSqCTO/rhucu+LsDuyrUrVML+F1S/KXGiPiTWg64RHvpw 9aceM6p3YDs5HxTvcgRjkZhGK8d3ZH0a0ev+MkucUTeoBdkxPVyH0rWYKor3HF2H2r+s zFT2cSYfiurZZwOsMQIp76Ns3JTdZbh/AUCjKwaqUv/WixToi7gTZ+I3dDFB5KoP/j3J e11ZzoKpDYO9ORxH9RNJgDOv0m4Lg2JNzafjvZCDAzE7WXSOOFdcX7MLFGgYtD7sFrmy nTRg== 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=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=OfyA2KHng8FFzhkhvsEyt/26O6qTPkk+WIEuo/zx42Hy0MVms0yG+Api6+vZ2jVUjM z5SBGLY8iDVdnAQSQqHME8P3+VWcaSmAuxGqgnfMYcegxBnPJCb/CptdIkgX/uwk9xwe 5sTcAj7KN5A8EjCul5y21Shzs0zWgCYnm5jSEJpTH1+lTMSZrqTiEXTW/bGUJcK8bpwV J2LsUSBRKfD0RXfirGD31giGl+Mw0NK3pbwDu7uxgvSHU2It7ba2mFgXZyJaKs97tkF0 RI8DtabAmdYoH7UtwPiG/mHga0hZmzm/dD94zvs6sOFUZzrYsjaOJllBljCQ/am600iT 1AVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uwF760ms; 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 n136si8401882ybf.227.2021.01.22.10.24.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:24:56 -0800 (PST) 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=uwF760ms; 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]:52454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l317A-0007z0-6U for patch@linaro.org; Fri, 22 Jan 2021 13:24:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311W-0007YW-2o for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:06 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:39676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311T-0006rL-5W for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:05 -0500 Received: by mail-wm1-x32d.google.com with SMTP id u14so5156585wmq.4 for ; Fri, 22 Jan 2021 10:19:01 -0800 (PST) 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=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=uwF760ms32l6bWLtm3doQiSQPHauyeiUQC+vKshg5CQFbLmVfuKKbyoIMHIKx353fs 3ldMM7/YBMfRp5MVB1nKfAxwLFsbIaENh4kSC3qxKxepPgl+6S2hbSbO9EvO5gClV/Ku i84A9X+vaRkRZQA8KXDGdZmydwAI6p1xGH7TawWQCiR5onP3i/aEIhV98QF+65P049KS ujUj120+0MkXukJ0F4O/O53eUO79FDf0LocT7P+oYq28oIzZSOSMPLtX9o8ymt8frrhy e6J2nBviB2swy8URf4SvjJlBLbOB744j9obtApoPd5+T8Q9EpDwcmA4YdMX7grdXkBcq Tacg== 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=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=l4RhevhM/zAf24/Q7Sp1BzZKazis9wDVrSanrqjYE7Vfg9sYORqlkXP/SPZSBxXqdw sYwFoLuB50XZsfQ+7Jc8km887Yi+8/8Y+aovaHqlO6gHV8NcfReoYxnbVRiGEGKKyk0U 5a4tXsvlgSKQw/439okCqUjkj3xyeGG7V3u6dynWWrogxu1AUu259CwFGHd0Jgy+VgO4 Mb9IdcF/Z2NLBRkZ6ZQzmCk5qfjseiCp9Mjw3yDTmez/k16mNi873C7FPPJxAWW8doh/ UVRy1/gZn9N9bcn6epas2VrL1TFm5D0bmLgSaY0h+2tJPgi2JLPb1yZBuXxEXy1Gahk6 yNrQ== X-Gm-Message-State: AOAM5335WO/d/LqdGWtXfgmcU8xxhAmFNN7A3GdJQgsR4iW5hgGD6OZA tcKTHDEjsQFqD8e23jrQGb0RIA== X-Received: by 2002:a1c:2287:: with SMTP id i129mr5068157wmi.109.1611339540807; Fri, 22 Jan 2021 10:19:00 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k1sm13206339wrn.46.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3E461FF8F; Fri, 22 Jan 2021 18:18:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/8] tests/docker: make _copy_with_mkdir accept missing files Date: Fri, 22 Jan 2021 18:18:49 +0000 Message-Id: <20210122181854.23105-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/docker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 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):