From nobody Tue Feb 10 02:28:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579688651; cv=none; d=zohomail.com; s=zohoarc; b=cAYSgI4VwVmMB2mzIMopTR6TcFaUflJtQ1Utc8GrV30WsOHFZCrvPncKfmAfyLydwVGBCbikMxOdF/bS9sR+mF8gnaOVe73i+mXEv5d1j6SExmVDpyNB8rT97kpLKnnKZkPgjdOLEQmAZlfg8KYSJH7hNTlseHdHIbYpr/w8cFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579688651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2aMYsER9zNwJfrjG23Mx7vaXxE5F7HH8AoPTJnB/ClM=; b=N64PndhLvzFA3VlCKFaQ6h0B3g8B9P8sVmk9HMjg8K2pyf8cFe2kc0AXaHvRcjilGKs2mQQZRYlgYAwn6J2lpYd9rklKUkG4qTKr7VcVe7Dun9jraBkVHK1xawCNwiOAmSKXzwDvZ3Uw2Zo0GwAALSqD+ogHoKlppb3Bo/gdy9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579688651857133.00667466994219; Wed, 22 Jan 2020 02:24:11 -0800 (PST) Received: from localhost ([::1]:39462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDBC-0007Dw-IT for importer@patchew.org; Wed, 22 Jan 2020 05:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57542) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuD9Z-0005vp-LY for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuD9Y-00085w-Lg for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:29 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuD9Y-00085A-GC for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:28 -0500 Received: by mail-wm1-x341.google.com with SMTP id b19so6203600wmj.4 for ; Wed, 22 Jan 2020 02:22:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q14sm3368334wmj.14.2020.01.22.02.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 02:22:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DE9171FF8F; Wed, 22 Jan 2020 10:22:23 +0000 (GMT) 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=2aMYsER9zNwJfrjG23Mx7vaXxE5F7HH8AoPTJnB/ClM=; b=m/vNa1VZj0E+3i2n6lj4816uWOX8JRchTe+zuQPvU7gY5rAkvF2NcTTVugwopQHGJf C5XBLwcC/OdzNUpeHDvrCz8c3HjCKKzHp7w+KkY2zwbDsrHikGKERdot/el1V+Ovv2SO U4HUMo3awzF8Ng5hm1vMrXMvoeFkZn1lnUtNXifaFg2/tyyG90wzuglAdyIkB9pJzDDa ZOICCEEOYLmwvzxkK1LOHCoJjGDbfvGaDeYl/jOZvTxWL0KX3KjHQUrOZNQHarmaV9Ls HqNVUYCw+SrPGtwiwdqCf6sIfCCPfPUjOlXDNjohymxtl5zzvBa1ob2m9J4gcnWYz9Cs bh1A== 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=2aMYsER9zNwJfrjG23Mx7vaXxE5F7HH8AoPTJnB/ClM=; b=qM/w3FB2dontUCqvoZZCjOQaRh9kLlIbrs2aYWuL8LWU3HNmsZYXLZwDGUz0jISClv R1xBkAxHkgPXQtByG2ymWXP2yh78BOMN7Ixs9SMDsL7PG/NLSN2saObUMJ4Xut8PkxIP 6bleK9z264zx6VxJgvjYjeNS3u1KtOFXXPh6OHOPeSzZjOOeEqA+iXxswGFa3M4E+Gxq Zm7GC1U9UivUoQsMR+BolpA0nt5jJ50GxQixWlaC+wxCZX5GNHZ6igFhNASzpfcRcIYn 6i6Tz6Dt9ku4Kjsr7sfuVrhjzYrV8XEZTm8u4Fefg6+RR2A8xq1p3nvCu1qpYDymwfuV bOrQ== X-Gm-Message-State: APjAAAX2ymUddJE8P912HUIKN7hnaG+37tJCElZtIrq+mqN1w7sNRAU+ dx/H1tcoGVLy5t1IMOTgAcnI9A== X-Google-Smtp-Source: APXvYqzSB3IPI0wn9oHVWMWdQRUcS0kJhrqKifFb/3dTJuzl0E6rndAMHPUWbmeuaWfbWm4DhFbx9Q== X-Received: by 2002:a1c:740b:: with SMTP id p11mr2290250wmc.78.1579688547434; Wed, 22 Jan 2020 02:22:27 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/3] tests/docker: better handle symlinked libs Date: Wed, 22 Jan 2020 10:22:22 +0000 Message-Id: <20200122102223.20036-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200122102223.20036-1-alex.bennee@linaro.org> References: <20200122102223.20036-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When we are copying we want to ensure we grab the first resolution (the found in path section). However even that binary might be a symlink so lets make sure we chase the symlinks to copy the right binary to where it can be found. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 31d8adf836..96d4326d53 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -109,7 +109,7 @@ def _get_so_libs(executable): ensure theright data is copied.""" =20 libs =3D [] - ldd_re =3D re.compile(r"(/.*/)(\S*)") + ldd_re =3D re.compile(r"=3D> ?(/.*/)(\S*)") try: ldd_output =3D subprocess.check_output(["ldd", executable]).decode= ('utf-8') for line in ldd_output.split("\n"): @@ -145,6 +145,7 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path =3D os.path.dirname(l) + real_l =3D os.path.realpath(l) _copy_with_mkdir(l, dest_dir, so_path) =20 =20 --=20 2.20.1