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: From patchwork Fri Jan 22 18:18:48 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: 368652 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1747782jam; Fri, 22 Jan 2021 10:22:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGgwh76X+Z4l/N9gBsps/RuBxr6UcCm7AhRJ6VBK+x32/cpsj/Nkf0RyELDR6a6jXL1S0y X-Received: by 2002:a25:bb93:: with SMTP id y19mr8500378ybg.498.1611339722976; Fri, 22 Jan 2021 10:22:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339722; cv=none; d=google.com; s=arc-20160816; b=CwIkLVxZM+S6Na6YjuccKfbKCME9XL1V59LXovkITR4BQzv3gO7FhDK6Riw5lLKNRV ut44pnJT3OK6iLnUL9xMo9WPdVH/8kQs7e3mKgYlb4/XipzQfWkTt4QPtcPvK0iWVlz+ 1oXbn5oJ5CJMp0HKh5kd6RpcWOd7lu/vdFlFy/4ir2zRR4GC6OFRsEJeb3qnW3WY6dZa yH8scPwNndGo6Y9wx2V0J8BcNxnlA2XlLOlmwKtY2DrkUpQ+lVS987Alu2KdJGXjsbAb +/qBRSFMI5S7ue7zVGjbbbKex8+LXCVcawZqrEN6xvAjH6iH26xr90OQgwyKupNnawmy vhyA== 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=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=JccKLRywf+f6dXRBEf8UsghVX8pQKJrY51selAE5mb5WibZhIBh1QekSjXF1KY9jdn gsA1gQ4UA6ZCtKrQJvzOGU/IynAZcjKkFMQYZOT6u59uSRcQwky4s1G2TPmAYUs39WZS NXpam4GlGMFcDWRGJjGXJ7BrSs7KPsJk7rYiawCBTq2QTVs5Cu7JLavV8OpBmuP2Qcuy /fxPwnd0vTdnGMj8W/OJe+zUGQBDsfzfsJ0n2DPqOxOGJCAHCTLCWTiLQCQ7bEjrdbSk Eyp+KYO23J5Ud+LleqDA2ryrwjAUqL11xoJfkkQfp9e2RvoOUEfynju7FTNf+5N/qzsc 6L/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L4CKDPG3; 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 e129si9409524ybc.450.2021.01.22.10.22.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:22:02 -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=L4CKDPG3; 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]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l314M-0002vz-Dg for patch@linaro.org; Fri, 22 Jan 2021 13:22:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311V-0007Y2-4u for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:05 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:46240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311T-0006rE-5i for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:04 -0500 Received: by mail-wr1-x436.google.com with SMTP id q7so5941879wre.13 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=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=L4CKDPG3h/ELlAHycAPDD38TFU6PiRrQXH8ClGXPRCVUHLTEQGDF4p3n0S22OCY60W 8n/hPlzmS35PbsFB7BmNqYkm3lo7rH85STsB7unQ7XYQSVfuaH9gyNzZNzKN17h0PLDM MP+ApkvTW+rukSch0Av+peBjRvFq6LxymZrUzrRol9SH1rUoanwW+DyU+SQ+vnUIPh0G +jqO5kEIvTOc36SdtCrkjJq/UwMjbCpuQJZvJ0xUZ7riL5YQjes7wv7o4sHGexrMkFwu 7pAC5SxN5n4Mp9P+FJVwVNkGfSJWIwQLKM7CM5SeU+fcXn9l2h98SEdCz3hcyr6PBCXZ 783A== 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=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=N89HftY2RaQUF1+RIJ+0BzW8l4q8nRp6ocFNQwp0H2ahnesX92a5L6ubIwcHjdj9IJ CVTwKBhHzDBLEmxzp32gc3SBw0jFW8sRggcH96HjC2ypCfwEE79c/CVDI/s/mwJSeCGu ICKubk4OyONrjicW48PCvn41+B64ruq5tKYaGBAW9pSnusPuJ2uuFt5ttSVx65DdDrup Q/cNRdfm293BulKsuSoHjAUvTtWbiahS/okiQQ2HoznigMrUBZ9tXgHwxefQSVRKq7wg 1CoeHXEzILBGvM78BPLZDypwHlBcfB9LxpVyNNx9Us9/yWADpUS9CRfFgN1nr9vMNWrb Oy+g== X-Gm-Message-State: AOAM532jJaDI70hC8maECd/8I6me/sDmRsxgKcQXLlVaQvuEzRFaThEr xBl2vDKd8EKPbWkaROTuYfzNMg== X-Received: by 2002:a5d:55c6:: with SMTP id i6mr5910057wrw.145.1611339539478; Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f14sm12228461wre.69.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 D00F31FF8C; 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 2/8] tests/docker: Fix typo in help message Date: Fri, 22 Jan 2021 18:18:48 +0000 Message-Id: <20210122181854.23105-3-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::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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é To have the variable properly passed, we need to set it, ie. NOUSER=1. Fix the message displayed by 'make docker'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20210119052120.522069-1-f4bug@amsat.org> --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0779dab5b9..bdc53ddfcf 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -209,7 +209,7 @@ endif @echo ' before running the command.' @echo ' NETWORK=1 Enable virtual network interface with default backend.' @echo ' NETWORK=$$BACKEND Enable virtual network interface with $$BACKEND.' - @echo ' NOUSER Define to disable adding current user to containers passwd.' + @echo ' NOUSER=1 Define to disable adding current user to containers passwd.' @echo ' NOCACHE=1 Ignore cache when build images.' @echo ' EXECUTABLE= Include executable in image.' @echo ' EXTRA_FILES=" [... ]"' 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): From patchwork Fri Jan 22 18:18:50 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: 368653 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1747787jam; Fri, 22 Jan 2021 10:22:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzoXZNtZWJVv8nTXK0GlS1W9HbZKjEBMuMwLeh+zmJ9iEhPwL6m1QRQblDqSL1kCyebImTu X-Received: by 2002:a25:b988:: with SMTP id r8mr6644809ybg.268.1611339723516; Fri, 22 Jan 2021 10:22:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339723; cv=none; d=google.com; s=arc-20160816; b=Ad7NHyf6Cm9ZAiHjWYMk5cCsnWhcvudUk0pw8qZSGv2fcAt01CzbuJ+NjKcUhHrLFF +Uti0mw8cW0fBE9ip/cDqds7eVvXXsmzi23xcJJdxAQ4mhAyrlNRI1jvdXPOIn8PyIs8 dy6UA+IDLeRkeXmJANi2GCSSIHEuWG3jxp3SD0EOAuA6RWcRRRORisXq1FmHGhe2xQ+q lUQT4gdcoCsnqfMc2TV2G5I3IKDQRdMj+Y6C7BycvSuq7ZcRzf/zEoeUAvC7dmQVLt8q gYoJbBsjeHRdi+gNT+DgYgb1adUA8s8cmjSTNDl3lK/0jUmsGtRlhN4YXJQFAxIYfPQw +xrA== 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=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=FFuuXM9wrqbr5z8Lu9wD2szhRmlvnzZAN+tMLr7Vn69kqWJ8f8KcFGj3KgN+EfqBYv bwUaRsQTMxN6yfxJp9JNnlYn33byD6sJEDS7iZ/wv8Se8i5lcnPR7YJ4sHCt9jzZOA3M oZL9EmCiVGQabjwxe5WqiDjIEbyj6vRFLyzI4i4xyXhgIydPNSwnlCLn3od5Kk6u8S8G O+JDrmOFBmcGtsdWxMDZAmKV0N9+EHxyUJfZXQ6Jc+9/q2tSriZKAbnTxAbQ2XJ/3ak3 X6BmSvBq6h2uI/p4PygMI13WYk/pqUyXwD9sWXJ/Cz3W6IZ9aqs9J1Iq9R9FDxPhiq0G nhpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=g85OQIQ6; 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 l19si9650589ybl.351.2021.01.22.10.22.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:22:03 -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=g85OQIQ6; 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]:42248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l314M-0002x4-Sr for patch@linaro.org; Fri, 22 Jan 2021 13:22:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311X-0007Yy-27 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:07 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:54901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311U-0006rR-0N for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:06 -0500 Received: by mail-wm1-x32e.google.com with SMTP id i63so5103348wma.4 for ; Fri, 22 Jan 2021 10:19:03 -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=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=g85OQIQ6WyiSKxgy1XA50KLRQVouYdEGG5XkK7gN7Ls1iBxkOpD26e84ytE4x8oxu1 +wOP6+bRIBiZomY6UptUw8M9KWoDAs9Dt92D8b5fqRKUV6ybQ92HHwR74FT6kDs1c0lM z2AR09w+qmcJIvpmKpblNs+ZIumIrccaSCaxYPN14XO/dC+WfBcBz9zfEgOEE0uOhIOh PvfOym+LMnrCUQqmycD+k5n005MxQKCoFJKkfTK4mtntdWhTQgNbnWFmFf3LrgCbhfaC km4rRM+7xwKZ8NIB4ROVdp//RImMt5+ZCHeMt+nNqVVHbCwPQ2vUJ1Ky0EnXxGwkMRyl 1r1g== 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=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=bJuQI8lOYa53A4ICZTqc/qAdb+4jCkYsaanflqy2hEdBwr4rSSOVSCjkU0++zsV0tO Bl8oySpGEZgXjRwC4leDqNd/9LjCSsM+tzIFVA47iHBadDRtxKQKNRTNov2KimQgq0HK Str2vYEmf+SRh8wUq6dmas7Eq7NBDuHkf+y0b4g2rFeXg5Y1zi7207U8j9D2Hwi7PyFq hS6Gd3y4LrCwyC2/vrhRzn6ZmQsuu5Un5TQn66qhEa+pLBY21Kx6e9ZHqR9zak78hZAK PG84jsTtIcZsSk1z9zaGWTXjC1VHomZ8HYPajxCGavXK2iTIbI1asl7c9RvhSjK6nBgQ LOjg== X-Gm-Message-State: AOAM533FqO/K1vhk9T63SD53ZpS22h+wGmPp8QnBkyS2/I9HNRZswl+d 6z5KQVLy6FBTCXqcy0s89uTHFvvgYQOxXUZd X-Received: by 2002:a1c:9e4b:: with SMTP id h72mr5248884wme.116.1611339542760; Fri, 22 Jan 2021 10:19:02 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q2sm12187529wma.6.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 060A41FF90; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/8] tests/docker: preserve original name when copying libs Date: Fri, 22 Jan 2021 18:18:50 +0000 Message-Id: <20210122181854.23105-5-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::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While it is important we chase down the symlinks to copy the correct data we can confuse the kernel by renaming the interpreter to what is in the binary. Extend _copy_with_mkdir to preserve the original name of the file when asked. Fixes: 5e33f7fead ("tests/docker: better handle symlinked libs") Signed-off-by: Alex Bennée --- tests/docker/docker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index fb3de41c0b..39da3fefcf 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -93,7 +93,7 @@ def _guess_engine_command(): commands_txt) -def _copy_with_mkdir(src, root_dir, sub_path='.'): +def _copy_with_mkdir(src, root_dir, sub_path='.', name=None): """Copy src into root_dir, creating sub_path as needed.""" dest_dir = os.path.normpath("%s/%s" % (root_dir, sub_path)) try: @@ -102,7 +102,7 @@ def _copy_with_mkdir(src, root_dir, sub_path='.'): # we can safely ignore already created directories pass - dest_file = "%s/%s" % (dest_dir, os.path.basename(src)) + dest_file = "%s/%s" % (dest_dir, name if name else os.path.basename(src)) try: copy(src, dest_file) @@ -155,8 +155,9 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path = os.path.dirname(l) + name = os.path.basename(l) real_l = os.path.realpath(l) - _copy_with_mkdir(real_l, dest_dir, so_path) + _copy_with_mkdir(real_l, dest_dir, so_path, name) def _check_binfmt_misc(executable): From patchwork Fri Jan 22 18:18:51 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: 368656 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1749105jam; Fri, 22 Jan 2021 10:24:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyfcAsr6v+gV5wUFX4P7q3Mn1L9Xrx76OtjNfXn9zAisP0zgQsnnPOr/wEgiB8aTcn9kTgU X-Received: by 2002:a05:6902:52e:: with SMTP id y14mr8221866ybs.92.1611339851434; Fri, 22 Jan 2021 10:24:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339851; cv=none; d=google.com; s=arc-20160816; b=h+NiPxwjJDV7GaeGkgB9Wc7NR+bLi3r7Wok7LorC9Iu1hB8pDwiSjrvTGgiXSGiHx6 PYJPGM4e63+fwQqT6WsnCzyGdGYZ5mikF/iQLLnGiN4SuRV+sP35SL8GFxNwgLrXylMz 30iVaoxjfHs67Aoz6e/y+dyevCCklbzsHyNBdzAiF8t04+eAtGXZqD/Y6rz/vTJ9foXY a1uz3toE7AtFWZ0wIGyPW3t7oYMo8cSrm7zzgIjOVUlkNY/PhM434xIxdWQNekmJxda8 oaWsiGn/sWdC7dS2oxKZ1UxvVYFAUIgFNyAIra9w0bAkqNivCZuqXE9KNUe16+e219oB 1e7Q== 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=Nr3F1s/uxAkZsOjDBgzUMQ0nBu9JtUUnCgKnB3ia0u0=; b=dIE2Yx7oOcn5+ML8tAs3NkOu2QDbp6IG4O9Wr3NIzamDDsEtoaIvGMG8Wifv8GrSGP hTjqHEkfkNjblUElbhBHc8/seaMjzDsEm7bq3RH6mjPbyqzRDjAYN6PdVh9uRY1y+WpA gGtX3Pkg9vo3HucHaIt1fjgi5WUtPsmqV6dfGTpwqdjJGxPplE1PvNILm5MrclARjF1E GPHm0XQBicb253X/lyfXYgCSO34nsdMElglvfeAQa5RA9hmVkojV+JDnJgPdV0tuRy1E WTs3lNRe2yEuO+uPocl3iW9Tgya4emXPw+Z1LjNsG2ypUarXHuo1WL0v3fQBLLBL9bVv IAdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Dfx5VBsx; 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 r5si9402681ybb.128.2021.01.22.10.24.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:24:11 -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=Dfx5VBsx; 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]:50688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l316Q-0007DZ-R7 for patch@linaro.org; Fri, 22 Jan 2021 13:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311f-0007cd-6K for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:15 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311Z-0006tk-Nw for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:14 -0500 Received: by mail-wr1-x431.google.com with SMTP id a1so5966953wrq.6 for ; Fri, 22 Jan 2021 10:19:09 -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=Nr3F1s/uxAkZsOjDBgzUMQ0nBu9JtUUnCgKnB3ia0u0=; b=Dfx5VBsxycuh2BYKdT4cTeeBCWfyqBl09LqOcxSVPHEeTXFEw6PDLQRk5DYtliTuiv 8Q5xfFIkELfcM1vtuR2fD+G10PkhISY/7EoZMGrZNRs7JGaPl0cKaCgAy93siLYVBZYa s6TrQr1GoIdXnVydjR/cUGQyLEIzyOnIpl6kpooxWoCP4D+5PUPvNV508u7elxIvSmKN co2/jXjThy6zSojo1tFZnXqrr8jhc3UR8PBROXICHC+WLKyiv3tpDwtdAfo1IauInD5F DMN90P7d3f3mY3kXblt4Skk5zAKnEtN5EFlZUEzL14zx18wxLjoPU3xxDgu0FBbvqqkU JWFw== 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=Nr3F1s/uxAkZsOjDBgzUMQ0nBu9JtUUnCgKnB3ia0u0=; b=J+KiPZKsdXfuMPTUh0jqU7aoCb31IDMZX9bPIlMw/vwCSs7c3x14ZwaEApljepr4+a TfpndCxPQf/hN/iFkWx8/JXc/khH/86D1og5uKtdyGpxjAYtAiwYNM7/ft8La3CgStr4 xeknDDPVcKRfoopFxSuLYQQmxEJRhz6kIAVa3Ct4Pr3x6CSuf1J+MwalkzudEtHDQ5kd jEe3eLfxDEorvYjfOtxIWp3lY7lplmvWva1aIP3/KNgwyrdqJ5Rv2qe292Lgd3UgbNoV pxl2J9h14SfVdhqRjr5GTOC+xQOpy+Brlkvw0lQx3f+eM92AOiqzDKXeazzyR763K9FW 57bQ== X-Gm-Message-State: AOAM532WbqedFk56Z3R4WaCwHclzQVvfUeLJO37zNlRXQEalVbEszHnp zoSsjufkWODYItCUL2LoyQOqng== X-Received: by 2002:adf:cc81:: with SMTP id p1mr5662034wrj.339.1611339548305; Fri, 22 Jan 2021 10:19:08 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d199sm12232884wmd.1.2021.01.22.10.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C9DB1FF91; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/8] tests/docker: alias docker-help target for consistency Date: Fri, 22 Jan 2021 18:18:51 +0000 Message-Id: <20210122181854.23105-6-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::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have a bunch of -help targets so this will save some cognitive dissonance. Keep the original for those with muscle memory. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Thomas Huth diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index bdc53ddfcf..a5c1e4a615 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -1,6 +1,6 @@ # Makefile for Docker tests -.PHONY: docker docker-test docker-clean docker-image docker-qemu-src +.PHONY: docker docker-help docker-test docker-clean docker-image docker-qemu-src NULL := SPACE := $(NULL) # @@ -218,6 +218,8 @@ endif @echo ' Specify which container engine to run.' @echo ' REGISTRY=url Cache builds from registry (default:$(DOCKER_REGISTRY))' +docker-help: docker + # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make # docker-test-foo@bar) which will do additional verification. From patchwork Fri Jan 22 18:18:52 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: 368650 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1746907jam; Fri, 22 Jan 2021 10:20:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxv0jzE40PcJxm5v6zl15tGAefYK1ibnjaNZMzsuz/mI9+FIbXk4L8y2BA1bYAzAjRaPH1s X-Received: by 2002:a25:d311:: with SMTP id e17mr8918537ybf.149.1611339649508; Fri, 22 Jan 2021 10:20:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339649; cv=none; d=google.com; s=arc-20160816; b=dmeq12ZQKwUPevjB0H3yiSNPJgEN/+/UcXkoiWBjg0mXRVt0DckMownuJ8oonCKDvw VLyQpysuDb9wQbtryeQuQ6vwbyOQM9WZFEtryLlyyBFWca2qXsbGTiCoZr/VbYRrJqGC Wlh0ucSiAohI3zr1D8fHgAQal708ATPpwSGUd3QTHwCnpIrqe1By1yuPpCExz1J0ywwO rSXLZ1Sga6nasRhBLtEDG5FyWUF1AVgwgdgihOEf4FnF+YNVfkqTWFP/SHlyalzGOyTt 50Lsx5cs8TEMhRF9zhp5yOeDxyly3hKbE3IvrSknl0DDl6fHWXHjBvNgcjaFC7P2ojHu Z7rQ== 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=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=UBoKBlTtMowkhtoNT+QhqwsMy6z68vtnDnm/TBiMBEIgxOaGCqsigZbwWku5x5jruk PWs0HPPfLRQ4knatCDfhSwXumDjXAModkxfDskLZo1uEBux+AZTDpSWAfAceqjHLJpsz VApUjH77OTsAJ0qXu92TPrAS9AOw9eoOg7paBviaQtySB751JDGSZxfugrWY3u30TI4E RmQxMBrTJJnci0K7S23QXTIasPe/AhRdWjJHN6iZO7hNoMf/2M0e4AkDooA6Cpl8b1Wv 6FrbvjC3qeQc5TZNq/qgB9c8ri5NFqECGw9Iw1DU1sKrLq4Jo9Vddesckgw+8rXBoFAY 7gxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Q0ekPi8d; 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 c6si3085869ybr.119.2021.01.22.10.20.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:20:49 -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=Q0ekPi8d; 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]:36642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l313A-0000S1-S8 for patch@linaro.org; Fri, 22 Jan 2021 13:20:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311X-0007ZE-7R for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:07 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52144) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311V-0006sI-8P for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:07 -0500 Received: by mail-wm1-x330.google.com with SMTP id m2so5108401wmm.1 for ; Fri, 22 Jan 2021 10:19:04 -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=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=Q0ekPi8ddPsLqWk/bzAAyuQOjZVex9EEdlUKCZGUQJLW+Cfs0cDpxDELPJlzsfuSQs YnxDQEmRSdjU8dtnMDfJptl86GwsXKt5MRLfiFG3g79iAhqkaqxsREB4qkBcJ26IM9KK 11f54O7pFgrQgAGtb4dWWBoroYQNS1jStLBxh/58ZclnyYwIrjwBe0M4UKVBXOxqzbPz SelAsbec5NS0ts+0lJkhykzge18kqObgVwRZARD/z3BR8tmfKiRZPkTydw9CWO1cLYVP m6E2wB8u6wjQqip6BS6LgDW5FsK5xjJIoc7s5JFNnabw5CLhjWtpsD6MwyKET3QBYx1A ACUA== 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=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=ZjFB9nuuJz+SkyHln0y1/6Jf7IUlCo0YBE/rTGtjaAp3UDElVO2UH7lNxR0xWwPd5n KTGcVjbmxMUJkVDvQPRG9x6zgTgMH/jwD5OwUXlv6clWGaEwPfFvzTb2hlKxvPfJbq3h JjmNJRWl3TDTRQ6QuDUaGjj7jdf/vFQX20oTp1aIELBrVzQweQjfL51OlQP3+bG3zvwv ObVt6s04HmUNGvrznMmNKFsPeyDmckop7KSmvna+HsmZ4JhrmZhitU9blZfz88Q9AfGX swI/mNAVocaUZrxvA6bt5tPQu12FLbL8KFaPeAbROm+0l/7u0p1k49MgHefwhZA6PojS EZgg== X-Gm-Message-State: AOAM53017QyJx8GXTXJjTx/lEglqDl6y9x9RudyBnevgeSP+mQRWU7c5 /RCCs3KJrBbbGWeV8pv4SINcWA== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr5220564wmg.66.1611339543951; Fri, 22 Jan 2021 10:19:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 192sm13636662wme.27.2021.01.22.10.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 351AC1FF92; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/8] tests/docker: add a docker-exec-copy-test Date: Fri, 22 Jan 2021 18:18:52 +0000 Message-Id: <20210122181854.23105-7-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::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This provides test machinery for checking the QEMU copying logic works properly. It takes considerably less time to run than starting a debootstrap only for it to fail later. I considered adding a remove command to docker.py but figured that might be gold plating given the relative size of the containers compared to the ones with actual stuff in them. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 20 +++++++++++++++++++- tests/docker/docker.py | 7 ++++++- tests/docker/dockerfiles/empty.docker | 8 ++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/empty.docker -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a5c1e4a615..93b29ad823 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -11,7 +11,7 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap empty DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -92,6 +92,24 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) +# These are test targets +USER_TCG_TARGETS=$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(TARGET_DIRS))) +EXEC_COPY_TESTS=$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS)) + +$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.docker + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ + $(if $V,,--quiet) --no-cache \ + --include-executable=$* \ + --skip-binfmt, \ + "TEST","copy $* to container") + $(call quiet-command, \ + $(DOCKER_SCRIPT) run qemu/exec-copy-test-$* \ + /$* -version > tests/docker-exec-copy-test-$*.out, \ + "TEST","check $* works in container") + +docker-exec-copy-test: $(EXEC_COPY_TESTS) + endif # Enforce dependencies for composite images diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 39da3fefcf..d28df4c140 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -438,6 +438,9 @@ class BuildCommand(SubCommand): help="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--skip-binfmt", + action="store_true", + help="""Skip binfmt entry check (used for testing)""") parser.add_argument("--extra-files", nargs='*', help="""Specify files that will be copied in the Docker image, fulfilling the ADD directive from the @@ -466,7 +469,9 @@ class BuildCommand(SubCommand): docker_dir = tempfile.mkdtemp(prefix="docker_build") # Validate binfmt_misc will work - if args.include_executable: + if args.skip_binfmt: + qpath = args.include_executable + elif args.include_executable: qpath, enabled = _check_binfmt_misc(args.include_executable) if not enabled: return 1 diff --git a/tests/docker/dockerfiles/empty.docker b/tests/docker/dockerfiles/empty.docker new file mode 100644 index 0000000000..9ba980f1a8 --- /dev/null +++ b/tests/docker/dockerfiles/empty.docker @@ -0,0 +1,8 @@ +# +# Empty Dockerfile +# + +FROM scratch + +# Add everything from the context into the container +ADD . / From patchwork Fri Jan 22 18:18:53 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: 368657 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1749106jam; Fri, 22 Jan 2021 10:24:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAwNN9CsuKfBINcNCIBcQRNEwSAudQrBE2FYtAyWCPOaI1adhmfkh/6fOtI3Ok/78IaZEg X-Received: by 2002:a25:b5cd:: with SMTP id d13mr8361481ybg.252.1611339851433; Fri, 22 Jan 2021 10:24:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611339851; cv=none; d=google.com; s=arc-20160816; b=YvCMabalXFyjdLaDuLP7+c+1CBYDMgn1Nczq7W+rRuvgNoHK+rzqG0yUv/+JHj9zrx WEJyQDhSjxpUU2duBOp3HjUnzObBwWpO8Q4VsUbWBuG6IqEc2xsTszpMlUbRt0be9PTY sc700//xefCAK813VBY4gCKlNKTBLwbYAO7aFIs61vaJ5Xl1KbJ4ge9tybX4gYTz2Ko6 T6iBZkTAbUm1c1C5AcW2/9KehqdgRs+VcrkrN1tOK8RjMtAz1Mvi3FLD65iEFI4I4E2K iEVqlSyrplKeYmihT+1DFNOhgWZ9MvCDT0fBfjW5C1PqONpW5Wb2eWxQxU36qrGUOwEi 487A== 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=f6zl2v9LPncQJucBqnlmMhx3Qi+VNlQAjrIpZhJtkg0=; b=uS4VCjsO2mnmCE2GjoYi2v6ZZmNdGhjP1rD+EK/qfiFhXdn5x1P++fhBxvyIWGGNfT zN3c4xN2SsYyKWaTHuFXbR4/CTrlgauEVo8XQ5kWWVNIt1DZFItq2CXuAZ9hSfmFptBG uA9l5P1QAHNOicMceRpTLk+qhF+Im1rklTWQBYbvICHYTToMG3CJOp5pG72+o8MQ5PEv 30EZ08D/CwjOJ5W66QbrxGIDjnjhjoJnPGuBYLw+9YAqYwYZiN37Ybm2KavDBNergI14 OQpkvTrpArcjfWNm95MquFQnC1BLo9Qnsckdhq1qzMMFPCfqqOla0wJ9jaDy74RdFrK6 Lbdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YgWtAWsv; 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 l31si9608456ybj.104.2021.01.22.10.24.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:24:11 -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=YgWtAWsv; 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]:50686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l316Q-0007DY-Qy for patch@linaro.org; Fri, 22 Jan 2021 13:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311a-0007ak-H9 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:12 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311Y-0006tg-RV for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:10 -0500 Received: by mail-wr1-x432.google.com with SMTP id 6so5973220wri.3 for ; Fri, 22 Jan 2021 10:19:08 -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=f6zl2v9LPncQJucBqnlmMhx3Qi+VNlQAjrIpZhJtkg0=; b=YgWtAWsvMlOXXBRmv8vIr3lvZRL4nUPjpiJWS35NlRmW/vMfw9ljNADhUMcfqZ8wUZ T5ZlVL9VBRuj2zPCWqcr3fhmDL0/kOLp6Ns6PiIZbeZ6AFaanY0uyI7CKF/P4Kbm61VQ LWr8BhM1CAc+EqFASEkwdQMKPvph1WBVq2ODTT5ykLgdKEfANPdMLv/G7nIRfO6Qa2/g mqJm09Bpu5DtsyR9nIdfl95lxlNg+2pxnwF1eiQuh4N6UJRLFMiyMBxPCJa2XBcOn/77 Aju+DyF9oXvcByzmA1fNFktcNxvdtfCQmOllFJ1gyZ5BWQ93dS0Eed/w1FxrhZ32OVqX 99jw== 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=f6zl2v9LPncQJucBqnlmMhx3Qi+VNlQAjrIpZhJtkg0=; b=PMetDSy3d14Q3YqvK20vn8SaQJCmc/i4Ih2e8A/gsQWQZUjZDUFjSYrcGhASyRTSek 669dFIQyInCaHbkhd6aAUdZA6AVORPwMfBiBybkgwbKAQYEuJwJ+ws1QfQ/HuFvcYyCR 3FtIQiQhIxtvZHGtZAw1OPCAXRacPrvLufD936HHI5BqUmY1b3I3RIyX0z7WKYzHY1/s SEQxbXp9HDZsi1x97du8EyONpUnDrnOR62pTf4r2fA6QDjiOuv7+cOOVFVw7C1Gh9/FU qrY4SAnRtJM2X2vtIL+pgXWwEzs8zmF2xhpxndrDgnRBw/Sc6Z6IpSG5e2MBOn4bywJQ DUwg== X-Gm-Message-State: AOAM531gX6IhnaM4oZ6Xb+XeCX4+ByuKJhgIpmXIwcYk6WRI1n12zq9g ae/dnCKXIsSrR6s2tld933CFJw== X-Received: by 2002:adf:cd83:: with SMTP id q3mr1878250wrj.225.1611339547462; Fri, 22 Jan 2021 10:19:07 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm13999756wrh.82.2021.01.22.10.18.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 480A61FF93; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 7/8] configure: make version_ge more tolerant of shady version input Date: Fri, 22 Jan 2021 18:18:53 +0000 Message-Id: <20210122181854.23105-8-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::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When checking GDB versions we have to tolerate all sorts of random distro extensions to the version string. While we already attempt to do some of that before we call version_ge is makes sense to try and regularise the first input by stripping extraneous -'s. While we at it convert the old-style shell quoting into a cleaner form t shut up my editors linter lest it confuse me by underlining the whole line. Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Tested-by: Thomas Huth diff --git a/configure b/configure index 6f6a319c2f..dd99939b34 100755 --- a/configure +++ b/configure @@ -198,8 +198,8 @@ has() { } version_ge () { - local_ver1=`echo $1 | tr . ' '` - local_ver2=`echo $2 | tr . ' '` + local_ver1=$(expr "$1" : '\([0-9.]*\)' | tr . ' ') + local_ver2=$(echo "$2" | tr . ' ') while true; do set x $local_ver1 local_first=${2-0} From patchwork Fri Jan 22 18:18: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: 368659 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1751256jam; Fri, 22 Jan 2021 10:27:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJwh9nTnlIFaab0Hft01eY09U0+WuY9QdPjpyMvde8KwITWj7x9UXRQayssN++ikWuRYL+8P X-Received: by 2002:a25:b4d:: with SMTP id 74mr7544194ybl.189.1611340048263; Fri, 22 Jan 2021 10:27:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611340048; cv=none; d=google.com; s=arc-20160816; b=bt0/Ah6to5yRQEATf/F5ZcYbTMqs39BUuQcV8ZXVrsZ4PvWcou7yButWRnie/DUwwG rlO0lA+2UracYHUxPU/c8db7VPc7hR2JDGPH9ur9uIP3wrcglnl3F6j5ygvZ4J9NOxmi KzYE/YQYdgy9VZmu8PdlyMz8UiwOLYWm/gf01tZ7gZwGqk2HoGlaNEANQxVf64x+5FQj CJPG+qhOMzC8IWzawzcnTmgrjOj5bUF5+S6w7Njht6JF7f31JOIbZ0A7oHljq8TBWhbi ro/cJQJey804FhteqG92prvTkZD54KAeUPr50B0Y4MlCfnVkpkullPIAQ7pKbq9CTjz8 lhCA== 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=dhXKFBqrjyWVwdgcjtJOpFUapsJmdBL8gQLJBNQUd1s=; b=BuY+/uskdOsgtXSEWy4ptyLcHEvzq+ptwuoKhChm8fyJGm+r5GY70UNlyrx9IRVAk/ 8iE8tMj9uklNaVCaUECl6R/4cl72I8OEFeffn+luOYSm45CKBwXh6Pi2HDJEaQNoWKul FkEapkqkrpyzCH8cQgY1V5LhgKSbKjjbgWgSwiK9bNDKODSPn50IFEfpM8pu4U+BiCFq slJRLFAv5vWgpx8Ar0hJWabHunpWoAi6uGYeWnTeRY/5s/sDfqKPDd5dPDSRRIGRNjtz nsgID0icmfvdUl4oa5L/4xvtj1FJ2mas/eJXqh3jQ3/L2bY/2jkA5D9jHdPVOaCDmg6G bhvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aAvto5t5; 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 q189si9521992ybc.212.2021.01.22.10.27.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 10:27:28 -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=aAvto5t5; 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]:60400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l319b-0003Oj-OY for patch@linaro.org; Fri, 22 Jan 2021 13:27:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311b-0007ay-TU for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:12 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:36739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311W-0006sV-Lh for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:11 -0500 Received: by mail-wr1-x42d.google.com with SMTP id 6so5973109wri.3 for ; Fri, 22 Jan 2021 10:19:06 -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=dhXKFBqrjyWVwdgcjtJOpFUapsJmdBL8gQLJBNQUd1s=; b=aAvto5t5U16jgRTJfZnjrjLXu1/YMAbmGEWoJXj5635Ujan8CoGOFHSZ9iu+iIY1OJ R98BJsjD5cyRjuWRoOT8GVNBuZ7ONh7LRqSDi79ep04Hcds/duTBK9ON31toovq6ya6b 5AhLu8aMCB3vCl7oTvnQqA71x3VcJJgsVg24tgirLIvCVULqP0Ev2ErBNywMz94jCvIZ om83F9jdiSPMv/f/xwOXSgR3TL/okeE2wc7SeDFY4gftXQyrYqg5Wqj5ut5BGHqldvft /hmgRAHh4LNqlHCgd2tTcYa8R6z+p6Cs/Mm6bHAHvREapzM4mX2xYpGWZ9nfeZBNnYwn vRug== 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=dhXKFBqrjyWVwdgcjtJOpFUapsJmdBL8gQLJBNQUd1s=; b=gwVbesfTVwgHvU6pUURyeTNQcm0ohihiG4M+TFNWB+SdK+4pvKtBwobNJPHh8kBJ5V RbVlrwUlS7wKr3/K6tIorrKgYy4efxmlZJvud4pkUlqxm0zksETWrwvVlUTIvWnpqtn8 e1Gl6zzYzExvFP/DlyUTuA/nvq+e0aa+O57hQ1MSsbBEpNRWU2D9/1saKJtLzCMw1j3R UXn6DBZGdT8UUI9u/f5vykKX0SUkB/YLMd4qdCtjNBGpDbSvMXLXJ+pmQ3AXP+rmPWw0 L63e9QT8Y1cW88ABRgwvh6Ox5UCp7jB9iBC0oS9AI1lnyZ4N1g+CFcD3nclmarlDZBuC 5UrA== X-Gm-Message-State: AOAM531RL2TT/mixVFmvbRsNzgYo/aNu5BBRPJzsVU0YBOwwNd8BK6Zz S34znEf1Xdexj4rwpQLwSmw1oA== X-Received: by 2002:adf:dccb:: with SMTP id x11mr2174415wrm.234.1611339545293; Fri, 22 Jan 2021 10:19:05 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p17sm12237800wmg.46.2021.01.22.10.18.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5C7A61FF96; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 8/8] configure: bump the minimum gdb version for check-tcg to 9.1 Date: Fri, 22 Jan 2021 18:18:54 +0000 Message-Id: <20210122181854.23105-9-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::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: Luis Machado , =?utf-8?q?Alex_Benn=C3=A9e?= , Claudio Fontana Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For SVE, currently the bulk of the GDB TCG tests, we need at least GDB 9.1 to support the "ieee_half" data type we report. This only affects when GDB tests are run; users can still use lower versions of gdb as long as they aren't talking to an SVE enabled model. The work around is to either get a newer gdb or disable SVE for their CPU model. Reported-by: Claudio Fontana Cc: Luis Machado Signed-off-by: Alex Bennée --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/configure b/configure index dd99939b34..0cf9718d4f 100755 --- a/configure +++ b/configure @@ -6169,7 +6169,7 @@ fi if test -n "$gdb_bin"; then gdb_version=$($gdb_bin --version | head -n 1) - if version_ge ${gdb_version##* } 8.3.1; then + if version_ge ${gdb_version##* } 9.1; then echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak fi fi