From patchwork Fri Jan 22 18:18:47 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: 368655 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1748280jam; Fri, 22 Jan 2021 10:22:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlVtb+c3859deWmhJD17RUmGl7dPh0oFQHslmuzpDNXuEQ/6ouCKouE+qKr4sCIbizvJil X-Received: by 2002:a5b:e84:: with SMTP id z4mr8557119ybr.519.1611339772532; Fri, 22 Jan 2021 10:22:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339772; cv=none; d=google.com; s=arc-20160816; b=Fv308468MXBfqCNMndg+7yzzARkmWjBdgeH/mfMNdph6jB3Owo3ffoJIf9TBMFnb/O T9suxBJ1fb+GeVbZGh0mqpZFmX6Da2brSP95YTXFFEpaNSXg6WUi08svG5a8sPGChgLv EbIs7RAiRf4RTQBs084Yx8eRPw4Zxoprch6V3d7Z3UBHNbFr6EqBkWhd7+4d5q6nLU3i lx9m7t15llXyS5Jtb1eBluNOJVJUpz0Qu6oSOcctj9y+0zAE5P+mVdjkhv6Tbyhi06xH 2TbPQ3Z1hXJ8YkBg0iOCwjun31YLfaywoxiEY8trx4eLBaYlH/v/X8a+Yi+IABja+6nS xPow== 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=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=vNrcDwIVoTFNGiAX8/RiHHgDRkFD+nTVatvzQDBIjGgSHb6FuE6+VCI3ehuGVrBZfL 52J4nPUNitUgfR/XLGo8zBFGa8zKon9KhF0dvG6MTKviTnYxctGa2rYBuwRRNu2HOibC hWCTNYmUKeS4V3EFOUAXqrsSYzyAKwg0XUyXjX1egjdJPAzNCKubqfqAczIc6BbS8S5Z jfhwimZYPIAQhVKC7a2sCnpm58N1l0cHpiGlqaeUvWmdqyA4f1zoY/t9FcShC6e74hKn DDMrQznIzUxVRyFxzAhi5b9kTzErkyEWXaMYd0GI/Ocm62O6AB2yld4Pa1KUwoMyLnnD 5XqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qjMKYb+C; 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 q1si8785570ybg.263.2021.01.22.10.22.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:22:52 -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=qjMKYb+C; 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]:44040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3159-0003hF-SV for patch@linaro.org; Fri, 22 Jan 2021 13:22:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311Q-0007VZ-Qv for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:00 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311P-0006qI-A9 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:00 -0500 Received: by mail-wm1-x336.google.com with SMTP id c128so5150183wme.2 for ; Fri, 22 Jan 2021 10:18:58 -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=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=qjMKYb+ClrN97Yndcd74T/PxkgWG7GskeMe6oJTx/R0KZUOlJC2j7hQbtb/4JgMneV BaJm0KSJE4a1uy39X742wCcW1FPWPRoby3gAQ8o7ArJLXtYTXTCsJlxiqAyn6tSLlFVK htFcAQcghQot6O3fQVVrWbrCY2poG42j68SHAjFfz1qQB7T0ZXZeKoeEiVnZErLHpV2m ABUxFfHQMYKUSoLg4GWEfqZ5vbpjDk2KR0WK1ZPCg+3o4hcmOUIUD95ZV+7+AFJgYlWf eV579ihJ1fwr50xpQjM/3+Zo/t2bhHHANURM7Qr3P0Nip9C6ktpUi53Wnw8Qq45WIv4r ijlQ== 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=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=JhfhK9e1RUXijGkBrPu/a7zWS/WSgtHw7V6Xg9yjB/RAbQYWj51kNIfXOIlwFc85bc 02Gs0EKh76FrHY7oTpqsRokqInlddKRaTKtwQ46vftKiW7e0BqCQom+3nv3quiTNQ6gC bt+RZQQVnstweimX6i2Ei151eGmW6mNwTSSoWQnpUk3OnWmVzbhK2q4j5kbIISDgxmxM mv4XydiaRu3wygnkL109HjqcB1ti1ejjASz8pER41GGlawO/cZeDSlfr6XXLnRhxVOiO y+o7Fuq1ZuUCRzCQ8yZg0dRAVS26wRJXGA2Q6EKbTarDlDvZary1CjcmebYJULIGVr6S pWMA== X-Gm-Message-State: AOAM530gUiWP8Jq4YQXmJjTQjAAzh+UMGiYcAgrD85a36HfL7KGTxjDk bKP1495nfUURDs0N4Wlf7dShSA== X-Received: by 2002:a1c:bb07:: with SMTP id l7mr5235147wmf.102.1611339537478; Fri, 22 Jan 2021 10:18:57 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l1sm5833353wrp.40.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B89901FF87; 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 1/8] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Fri, 22 Jan 2021 18:18:47 +0000 Message-Id: <20210122181854.23105-2-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::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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" 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> --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 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: