From patchwork Mon Feb 8 12:38:07 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: 12076281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75292C433E0 for ; Mon, 8 Feb 2021 18:59:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E53A664E73 for ; Mon, 8 Feb 2021 18:59:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E53A664E73 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BkT-0000m8-Sp for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 13:59:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95p3-0003eQ-8j for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:28 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33043) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oT-0007iN-0G for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:06 -0500 Received: by mail-wr1-x434.google.com with SMTP id 7so16965163wrz.0 for ; Mon, 08 Feb 2021 04:38:28 -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=Yqbd1kuQwaJRIQ4c7pGQEKdHV/g/Is0sgX7tD793D3A=; b=DyeOTSOeFQlfdboHaYFuHO054L99u9UvKu2rRke+TPZtJarQEiA0wG13cgwgqmIXaq X7MTSJbguN3TzuPRgPH0zXdNae26WHKDYX51E0/91+1KBsu3Hdy0GaNyySW3Tzd7WDUV XIBHkr7Lh5c77y/20zp3yFSeaXHVUYZVYaKG3eJ4HhJGgTlrtGGuMO4XhCNOWiA179/f lIOXOn9AdAocV30GIE+6jCcjyS61yk7SssUqJCBi+xH+dji+mlWcA6NRNu/XXK+IFajs QblDim/cKTo0hCxVU6XezXjBznu5KGAg7rz87+cTMPOGXG43AGCuHlRjcyDIR9qPZrXj vQow== 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=Yqbd1kuQwaJRIQ4c7pGQEKdHV/g/Is0sgX7tD793D3A=; b=I4QWbYerT0VDhGdQuLTjMLcyKmF4CPQlTbyMfm7bLZOn0niRA6oU0f6CVfElSopN3q MYAj/ePl3CCPM/Lp4V8pUs9LtJOrZXruEkQ2yq2mHVZNBcg+pCv7MuPR4sEn4y21O7Uh eC4V72ALJLDuXarzAY5jWLLmAg1wFoCKO420aIlV9XtMOSLb+Ag09o+y9HMADSXGiBEi OPQK4hK7aClyzOle0AyhGR0T2El+qZcqzcd+Mj25Tzt+VYmCNNs7K+6rwGjPwAElZ9vD AgndIOW/lU7WfGkHHu4InOOiqkVVK6iTJMX0urFjc4DooTEWHZ/6owDZfzIKueV9w4OI XLEg== X-Gm-Message-State: AOAM5338yEeY6HAFa/1JBKKuM6sC5Hd2tOgMYXJemJEsd/gUsmwBnLp/ XS3CHErlOCZHk685G53FLsku+A== X-Google-Smtp-Source: ABdhPJwSGIsXZmwMOqp6c6uSYS0gdSftXTUGahW4AlvNai6ABoZKZDTBGcbRFOUE3DjGEOmc201vDw== X-Received: by 2002:a5d:690b:: with SMTP id t11mr19854538wru.12.1612787906817; Mon, 08 Feb 2021 04:38:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h9sm4475291wrc.94.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E01791FF8C; Mon, 8 Feb 2021 12:38:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Mon, 8 Feb 2021 12:38:07 +0000 Message-Id: <20210208123821.19818-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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=unavailable 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?= =?utf-8?q?_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fix a variable rename mistake from commit 5e33f7fead5: Traceback (most recent call last): File "./tests/docker/docker.py", line 710, in sys.exit(main()) File "./tests/docker/docker.py", line 706, in main return args.cmdobj.run(args, argv) File "./tests/docker/docker.py", line 489, in run _copy_binary_with_libs(args.include_executable, File "./tests/docker/docker.py", line 149, in _copy_binary_with_libs libs = _get_so_libs(src) File "./tests/docker/docker.py", line 123, in _get_so_libs libs.append(s.group(1)) NameError: name 's' is not defined Fixes: 5e33f7fead5 ("tests/docker: better handle symlinked libs") Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20210119050149.516910-1-f4bug@amsat.org> Message-Id: <20210202134001.25738-2-alex.bennee@linaro.org> diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 884dfeb29c..0b4f6167b3 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -120,7 +120,7 @@ def _get_so_libs(executable): search = ldd_re.search(line) if search: try: - libs.append(s.group(1)) + libs.append(search.group(1)) except IndexError: pass except subprocess.CalledProcessError: