From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612809879; cv=none; d=zohomail.com; s=zohoarc; b=ilpGLWyF9sTY4L+HppiNOfUcKWwoO+FubckNarHmSpcaXOfchDNR2lgY8p6YoTZBkckvBjWQFJOAwmGyuyiT7v5dydROrzEVZwHEuWQucZZ/6YsJjXyZEbrXefjs/bhYjxATiHpXq/25DI+V4MHmgz0tcZYDwXZZrNU0jNm2qY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612809879; 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=ntQFxCLhqX7LYRou1Wz22akVKHJlOcWw8jf+IBT/9qc=; b=lwSQrW4mbHK9+wTb8K2e1im5CYqf6l2z/CNiZsuOUO0feJHQDksLCTLU39mew6Ng4GJoF9qCnbcJ905hHDECwBMpryuF1jCUilabBtVzXZpIDj+tI+XxYkyM7rFk/lZmhm8LsJMBMxufvkGOiV8AkAjB1drMo0lbXZaEaB+2aUY= 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 1612809878999844.3597216484873; Mon, 8 Feb 2021 10:44:38 -0800 (PST) Received: from localhost ([::1]:33132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BWW-0006L6-GV for importer@patchew.org; Mon, 08 Feb 2021 13:44:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pE-0003fy-Em for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:39 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:45121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007i8-Jl for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:22 -0500 Received: by mail-wr1-x42e.google.com with SMTP id m13so16850806wro.12 for ; Mon, 08 Feb 2021 04:38:25 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c62sm20088546wme.16.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CA1231FF87; Mon, 8 Feb 2021 12:38:21 +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=ntQFxCLhqX7LYRou1Wz22akVKHJlOcWw8jf+IBT/9qc=; b=JXBG6MV6tmFfA/MPN7ceCtEjZAUJ1v/HDZgTZXmCi8W6vGA0KXaKYe+Xpcl1pMz/Zu TWSlo89QyhyR2OhifqhVsdC7gIEZPY4Nx4T6DfiZOgVrK9Lzf5R+PnqxeLh4ZDaSIcgk Vmre0mOoT9qk9cMQh0FCiC8zUQtTcRYa+M+ZDLrHmIiOeCUpZbEeE7zYvLMCMtBCx9fP O2XHbcp9iPeH2GKRnQX2T+y7x2bn/firT6FOp4iSarvT6wI/kybfJzrCopJV/oSS6S+Y TOnDonTq3DA/FBcvcD88HnegXUhXRmQnA8n66Z+5kissD3iyFf2goMXhNdItv3bc2UpV iRig== 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=ntQFxCLhqX7LYRou1Wz22akVKHJlOcWw8jf+IBT/9qc=; b=YZEvHbbYxhDkyByO28BCtXMDbNAtM7dd/3fioiTFZdr+CMwvPScnlrgdqy7nuO+3Sb 9U5lv+d3Dt31yLCM1Tok8h2n8HQ8CVJGlekizBmlgSZ3uXq4V4R9c9wcTcQJHX+w/UQX 0inmMIUjuEhb9iCkXjDKujyhFwD7o/fz6nltwmotos9GNQuZhuk0FmQnTwD0ZAmn0nRR rPPb3HRCkMlMrMkVFnxXpCZHF2AJWKKZDSKdWoO5ijLEHxNbipJGuRpb4pMt83+nBttz OXadZKLHRgYlKgz0sOokicnLqKrt71kH3uY6xZ5dbCqvHyYuQpot8vOR9sv0I8L2wd0n Q0nA== X-Gm-Message-State: AOAM530JQloqzUIjG5cr4pn2bxjhs8uGAjNgZ9FsYnKdbG7hqYp3xZL2 3XCeTmnjOY5huuXBUOhACxBvLg== X-Google-Smtp-Source: ABdhPJzUBBsQXcS8JgCkh87AkSKhvMy2t3j1waC7kbU34YAxppCNwaszsi/e2Gsu7GwJ8j+S88UQcA== X-Received: by 2002:adf:f7c5:: with SMTP id a5mr4356572wrq.243.1612787904552; Mon, 08 Feb 2021 04:38:24 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests Date: Mon, 8 Feb 2021 12:38:06 +0000 Message-Id: <20210208123821.19818-2-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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: Thomas Huth , Pavel Dovgalyuk , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Pavel Dovgalyuk , Cleber Rosa , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Our gitlab-CI just showed a failed test_ppc_mac99 since it was apparently killed some few seconds before the test finished. Allow it some more time to complete. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Acked-by: Pavel Dovgalyuk Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210127065222.48650-1-thuth@redhat.com> diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index 772633b01d..c1cb862468 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -31,7 +31,7 @@ class ReplayKernelBase(LinuxKernelTest): terminates. """ =20 - timeout =3D 90 + timeout =3D 120 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D1 panic=3D-1 ' =20 def run_vm(self, kernel_path, kernel_command_line, console_pattern, --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612810769; cv=none; d=zohomail.com; s=zohoarc; b=oDtTE0UZ8a8r1B3x8TG9a4VFEM+o+diZPGETQaEhjQN+dAsrRKE7psaJv5bPiey727Cvx6+hQPOIzxdWZDvEAn7PfS9BBd3aHgYVliHfj9QdPsxG7ZgGZqnNBljVBs9v3XafLAf3S7OV7+zSy11NYCQolVJb+mmnDh5NGNYEF84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612810769; 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=Yqbd1kuQwaJRIQ4c7pGQEKdHV/g/Is0sgX7tD793D3A=; b=CeuSpeExccmVlAzmQzZ/q6BQAeqw+CxNnhUPs1QvfNBl0esFHcnhHNnVcixH2apdX/jwvZw4nweLDsNG9wGSffJF9sMCV3UVMIm/FyWOpqyTcOv12xs/AWyJnXL4UwJ1wqrowzpa6z4VNh9V6Fho8CoxmAY3GJjL6NjvpoVRKCA= 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 1612810769718817.3440357591528; Mon, 8 Feb 2021 10:59:29 -0800 (PST) Received: from localhost ([::1]:57396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bkt-0000m8-CQ for importer@patchew.org; Mon, 08 Feb 2021 13:59:27 -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) 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) 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) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; 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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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 =3D _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=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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 =3D ldd_re.search(line) if search: try: - libs.append(s.group(1)) + libs.append(search.group(1)) except IndexError: pass except subprocess.CalledProcessError: --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612809551; cv=none; d=zohomail.com; s=zohoarc; b=ZBTEeA/J/9ooZEvz2Hp1PQgrxzJGqqh0+vCdBeHgLZC4cfsQMVL8ZBQ8ciAg3RO8roVkD9+LV/cWsOX3eSAVni1Keqi2SSB1qUhIAnt1/maJdJMbLd6T/JzhfxThQHchazWAkmxdyVdlGLVH6zbm/U6ViQVubmxnUO3sTf2o3fI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612809551; 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=69e0vkOf0vuiM1aa1l4UrAX0DX83ZQ+TUhL623hzy0g=; b=Mzf/afdnVZrUj0d6M1mobSYbmeIPyRTSe2UwXdyrlvoNqEM2o0TFGjUnTtpZKVZcWrwRQWO7eo9DrXmN5YwWnZ/miZh0A6aG6QAQFMN5UPDMN3Cn65ouioC5ocesAZslu8UFGcGP8Jo8bdAgf+7m7qIJRZiD03mN6VoNtdVgkkU= 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 1612809551241731.8322310630049; Mon, 8 Feb 2021 10:39:11 -0800 (PST) Received: from localhost ([::1]:53832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BRG-0002qj-6C for importer@patchew.org; Mon, 08 Feb 2021 13:39:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jz-AO for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:52735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007ib-Km for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:02 -0500 Received: by mail-wm1-x32d.google.com with SMTP id i5so4393733wmq.2 for ; Mon, 08 Feb 2021 04:38:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n10sm29030792wro.39.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 022A61FF8F; Mon, 8 Feb 2021 12:38:22 +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=69e0vkOf0vuiM1aa1l4UrAX0DX83ZQ+TUhL623hzy0g=; b=f95uW4qrrMR8Mb2n6Sah6GsJwNy+PDqDZaVvA9wau7tqpKhJq5szlH7sDtVOTq3VRP 1rPnqaKnL+Brc0V4hKob86Vk09kwOcq46W+dhsdlB88rReCHX3Vd/GOK3IHcXTKzQx9L CRjc7EOKa6ntC//tYLcI66/97mB+6m0d8XG99eyRQhiVgSBsKunAmNZrfh10XMt3vjd2 vNXeEaOID2VPtY2u6MpKr7gBaNzFvrYa5j7MCsi+7H15ddNKqOD49uUDrFS4gc0bclVH GiU+O0PnLFU0CMwBiDPVOWdG5i8DTtCDWEfYyA3bVOwIqqgc7By8BQzfzWdH/z5XSXNb JU5w== 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=69e0vkOf0vuiM1aa1l4UrAX0DX83ZQ+TUhL623hzy0g=; b=au7A7Lt91cHHofhCDYRrujYLUdNJzmwFdkWwKVe8gO83X9UqjEn89BU8VUtvlIVm8d oKPze28jkwWiwHzsR9U3kg1KGCqkNuaNxCJOLJjHWnYd7sRSMTFINMXWzDyjXCzGJrLC l/v3aCw4Oy8262GqEGo8NMkSQfvw/h4dYpr6LcJe4Y2MV4GybJrv1daLIoPTy5A6aOFd iEwyvR81GcI+KWA60CIhuYgCuQSCPAc3qLe1CeAUkXz026thwGQLV/yPBM5u1vc4G+gH +bi1QdLBw3QW/2DE61+T3HpJq30p0rN3kfCQJX/bAUH3E9cy4bKPRwpx+eeDHzpa1/aH JUOQ== X-Gm-Message-State: AOAM531qEjctM3BhyIMUPRTPt/Vd4hu6l5T/J5MYUIAt8ln/MmB50SiN 8apkMR12h/1RifuLFQwGbrNEOQ== X-Google-Smtp-Source: ABdhPJxNfsh8kRyKjR9ZqUIsahOSnQGpV7k3jLTW6A7hjrXSjXqkKQ1wjdthJF8iBHYyrGaqxEK9dw== X-Received: by 2002:a1c:67c4:: with SMTP id b187mr14724330wmc.17.1612787908039; Mon, 08 Feb 2021 04:38:28 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/16] tests/docker: Fix typo in help message Date: Mon, 8 Feb 2021 12:38:08 +0000 Message-Id: <20210208123821.19818-4-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; 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=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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To have the variable properly passed, we need to set it, ie. NOUSER=3D1. Fix the message displayed by 'make docker'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210119052120.522069-1-f4bug@amsat.org> Message-Id: <20210202134001.25738-3-alex.bennee@linaro.org> 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=3D1 Enable virtual network interface with d= efault backend.' @echo ' NETWORK=3D$$BACKEND Enable virtual network interface with = $$BACKEND.' - @echo ' NOUSER Define to disable adding current user to = containers passwd.' + @echo ' NOUSER=3D1 Define to disable adding current user t= o containers passwd.' @echo ' NOCACHE=3D1 Ignore cache when build images.' @echo ' EXECUTABLE=3D Include executable in image.' @echo ' EXTRA_FILES=3D" [... ]"' --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612805758; cv=none; d=zohomail.com; s=zohoarc; b=oB44aa9Ypc8qe0jmUp3TQDdXQYoMbkzaO+EZ5g48DS85Q+aRzvLMMnj4I4lHWbSqIGsHZ0j9dMb4abW0fEPkfA5vdU6zx9EG+2s2r6YSTP7+vtz7MXC5f2vMa2Nvm2sluOyxhNLUGK2rJ7KQbwnGpk9NneYLBB+pAyF+KA5eewc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612805758; 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=/C/IeWDEzIaP4F9kXntszm+mIX88m1SsEC/60p2ki5M=; b=mFOw0RsMsMRUmjOurIum1pXPCRvUcqAgFv9zt4TqHjSrKt+wiguuqZpyo7RVx/n6GCoMW9vmEIx9YmweN0sMx7qd1BB7R/1pEljMHzCvDLSVLzlTFvs73VIPb0RK7UkqaEdN0wcuwzVLsCb8WzklQwrtzt1l+8DqVBrQCwZFux8= 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 1612805758062526.7982736900627; Mon, 8 Feb 2021 09:35:58 -0800 (PST) Received: from localhost ([::1]:33846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9AS3-0008MC-U8 for importer@patchew.org; Mon, 08 Feb 2021 12:35:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95p9-0003fk-U9 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:30 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:41949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007iV-I8 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:12 -0500 Received: by mail-wr1-x433.google.com with SMTP id n6so4078442wrv.8 for ; Mon, 08 Feb 2021 04:38:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14235741wrr.3.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 193A91FF90; Mon, 8 Feb 2021 12:38:22 +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=/C/IeWDEzIaP4F9kXntszm+mIX88m1SsEC/60p2ki5M=; b=vPVQrLjs6lLkXHYQF/pVoyuIbGP0sf3F5NA13rvPmuxDGiPVNrhIFGFF3moMQeRU+7 I33o5nFtjHScRcBZAG7Xg3RgG3GASwUj83Q8I7BQz9FeR4yh+p+rc/q5K4fj0AjcT+Af UlStFgJi2HEstONwksCOc9k0ZJ1jvjrRAhf0ak8CgxPbxet3UIuOI8keNds+xSQ6JUGq HOi72dGfoLKDEnzU/pt+U/xH4q42B55+n+BmPhIX5a8tQiqmN4t4pufnKUZkpmWBfaty ggpM5tHxJ75kxCERNMbmZLvFgCwcYfHwX1kSThSqWgPtik8n89SZFc0wuQjfq15sVMnY hNsw== 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=/C/IeWDEzIaP4F9kXntszm+mIX88m1SsEC/60p2ki5M=; b=YmP0pFDCq5veYhUV9nFzSqsXeaXqKaIgq+djgN/stSHhtoMVu1NvDKI7e6CQIN1xIk fZDzeiwiqLkJHWnkiyOhONGtpAdqhmeFaJxVKHStPiwEB9RM2LQRLgmUJJRNaU1hgGus tApHIc+a3Sd2WSQFTxOdjQU4obTEYnITGFzy6Bg/u1knjBG1geKEIHtLZ8EeGNuES6F0 xtBxJ+rZ+06JG2G6XLW6I/vjxP2czIjYjiduiNmJkut5CwGoXCYfx9yCLNFt5qf3WPuT C/+llQ1QVDrM7Tsm00AQDtboripBOks76whd08F83vWUb7MPH9jX5c+oAf6nPXWyIcUk fgig== X-Gm-Message-State: AOAM530i2VJsHx16Np80jO0bpEB8oI5U4WCU5Z9v7oQUWA9T6ZM1f4In koNaJYl15N5rUmQj7urYMwWsvg== X-Google-Smtp-Source: ABdhPJxVhjqqBC06SJyB/kBFQ0ZgVL1ALWTnTaJaaEfWkdshmCig4E0tGlfLee/aLSxVIuPGjBerYQ== X-Received: by 2002:adf:d085:: with SMTP id y5mr20183417wrh.41.1612787910014; Mon, 08 Feb 2021 04:38:30 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files Date: Mon, 8 Feb 2021 12:38:09 +0000 Message-Id: <20210208123821.19818-5-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210202134001.25738-4-alex.bennee@linaro.org> 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=3D'.'): pass =20 dest_file =3D "%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 =20 =20 def _get_so_libs(executable): --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612805969; cv=none; d=zohomail.com; s=zohoarc; b=XTfH1htFL59VflAETp3KtP87KJhyD2ckEa3s1P0w/4dkpK52dp2l9/iKh8rkuIRqtZYx8MGSsS8O80hUAF/5oU59IsRpW/3txhjbbYaPC04MUDl+9Co2HCBLafmjC74z/lPLYHfNVUaGgF0F0ZkwvrIc5gABs8eqhO+TOEMhlqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612805969; 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=l+elDiMrFXDDD+nT/WQU5kV+TB/XEnR+Ql7bQKLVzgA=; b=WJ2NS+ruUetmIdHInGWL6QLx6soq7e7oRy7J7kcplbogBw0H8HU8fur3heymtdhaiNFFw0+vJ47zMrqeghuzUcMplaHDmCNAezW2wyfMmJzHNsvQaKDQ7cGYo6PRwX/WxcFTDi3f1+7p2bE+y33+YsZiHf8ULjYMCLNAxqGwKp8= 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 1612805969714186.9770433070447; Mon, 8 Feb 2021 09:39:29 -0800 (PST) Received: from localhost ([::1]:42296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9AVU-0003ba-Fk for importer@patchew.org; Mon, 08 Feb 2021 12:39:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pA-0003fr-RN for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:32 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43044) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007ih-Da for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:12 -0500 Received: by mail-wr1-x431.google.com with SMTP id z6so16845832wrq.10 for ; Mon, 08 Feb 2021 04:38:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r13sm22532595wmh.9.2021.02.08.04.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 300A21FF91; Mon, 8 Feb 2021 12:38:22 +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=l+elDiMrFXDDD+nT/WQU5kV+TB/XEnR+Ql7bQKLVzgA=; b=MQ8fCs51nGcAi+iPDyRLztZgtd/xph2Vn6AvSxWz2N5wy7Svpnk5sQBW7yUh489NqJ XItKlQl6PVXVFjYmf9khSvzdnV3bULZsrqKFpIdJRP+0D4mIC7EnS4iIxVi4DuWzZkhZ sBZQQR9QjDo6p9fbRoOflZMYLbJHWmx7AvquVSPBFkuD/Xx3OXCIwPEGq7atBjuVHNgV 8Cs6LeA+ek0pe7xruz1dxTM0ROXpWT8tPzsaHtwSEfA11ox1ZSOIrCWR+YCvAN1g1NPF NmiNt95QQFOgj698ddH/qxcklMlS0W6fu7AuwOMDlPpm2e7Z9aC5kuQX4GlDzHpyU/YV T1MA== 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=l+elDiMrFXDDD+nT/WQU5kV+TB/XEnR+Ql7bQKLVzgA=; b=C6bZR21lEctRij+iCxPqq38uDxepCDiK16E9nyBf6gqEAU09O2OJx0L5+4j40FABKx gXki/Pe7QWyLHOQkFn1yJoIbJKSXD2boSabgxWLVtW/mSIu/zNluJ/Rc0PV5z1bD3ydF MKOP/F3oqaQcNooHVBUT7qIQRGeMAmJ6eyxOy7gaHtdUuGWf2qGw/71ysSSUOVF9v1Wb CL0qRHWDJo8/EHOqtQZ7OslXmfwh6WuTHMjKhdiWiST2SO89oi8awNSNvseW92siJjDx ZFKrEQx3dUgcPbaGWtP3XufmpP3YWo5tdClNoS7YU7YoGZaJ/z5ggassVrgdzpIK0Kxd eHbA== X-Gm-Message-State: AOAM5314yhoJkFBthzhzaC9cLIkHY9zNu95QwYxVaIzB0Rr8HlRyKpBI qkk8X4pjUpOhtHMKL/kFAbmYsg== X-Google-Smtp-Source: ABdhPJxrce1GQwWEqdfpStKcnDaxfYwZX0E2SgqYf5xw8tuc1v2jsgrvuan6olx8zy1sbqRTy7I6dw== X-Received: by 2002:adf:ea02:: with SMTP id q2mr20058475wrm.25.1612787912106; Mon, 08 Feb 2021 04:38:32 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/16] tests/docker: preserve original name when copying libs Date: Mon, 8 Feb 2021 12:38:10 +0000 Message-Id: <20210208123821.19818-6-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; 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=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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Message-Id: <20210202134001.25738-5-alex.bennee@linaro.org> 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) =20 =20 -def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): +def _copy_with_mkdir(src, root_dir, sub_path=3D'.', name=3DNone): """Copy src into root_dir, creating sub_path as needed.""" dest_dir =3D os.path.normpath("%s/%s" % (root_dir, sub_path)) try: @@ -102,7 +102,7 @@ def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): # we can safely ignore already created directories pass =20 - dest_file =3D "%s/%s" % (dest_dir, os.path.basename(src)) + dest_file =3D "%s/%s" % (dest_dir, name if name else os.path.basename(= src)) =20 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 =3D os.path.dirname(l) + name =3D os.path.basename(l) real_l =3D os.path.realpath(l) - _copy_with_mkdir(real_l, dest_dir, so_path) + _copy_with_mkdir(real_l, dest_dir, so_path, name) =20 =20 def _check_binfmt_misc(executable): --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612809187; cv=none; d=zohomail.com; s=zohoarc; b=B1ximGxpV+M1uc8X9KjW8FyrpTo6sUL2xqGRBA3Bgi8sv6fNhncrCm+UTNB1v/ytZpbB8xBIW82UPQ6jrVFlbMvUD7+HAzyTC1KOH9XauJyY9CUJAHiBD3coYlgsTiT74CvdntNNBFrYbupFAZsW9qe2Hbq7kP4fBEDoMS6j+Eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612809187; 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=ubNATQbmg8iLajRmP4P0Pz9JUdOIhvXA6u0rva7SAvE=; b=HORuudDtepgh8FzxqAIc2OAHIZgdE1T0zini9viqhKjtMOHnsW4bzXE/5CgCNifPYT3by8h4aGsarSvzGn30nm+VpKdSwfHMNVnS2FSgc0GwvuzOOdvxPLTcLi6Ntrzrh8iW04osH4RzNmErmyDjPTOqT8cMkEpll4hbqZB5ljY= 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 1612809187395611.4327856354622; Mon, 8 Feb 2021 10:33:07 -0800 (PST) Received: from localhost ([::1]:37012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BLO-0003ia-9r for importer@patchew.org; Mon, 08 Feb 2021 13:33:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jm-3l for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007jK-Kl for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:53 -0500 Received: by mail-wr1-x42b.google.com with SMTP id g10so16944043wrx.1 for ; Mon, 08 Feb 2021 04:38:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k15sm20167889wmj.6.2021.02.08.04.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 487B01FF92; Mon, 8 Feb 2021 12:38:22 +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=ubNATQbmg8iLajRmP4P0Pz9JUdOIhvXA6u0rva7SAvE=; b=b+Dyei4ynkXCJhzfPoJBcTK3PXpDQwCoBWYD8M1PWDopR4kz14QgiQCbGRfcqqT4U0 oDOTWxBub7JLhlzOS/kbMsstDR1szHn3GqB1kiejAzdR1svDKta8YyN9HpYefpa7KPe0 BK596Xj6DSs8qGwkqMr2qcVAe/Uq+qyRCmVTBzTs3HKU8KqUcejR+yFDlGBGCIVHaa8q QaudGjaFw6+jabOyG63yKfuPisSU/ord6/aDwMtdlCEJiRoRjWhBikteVpdE6BohMBI1 XY9h3+xlx6/Ke7C6tKELuNUkca898eyEUuESadHV8Dg17xFWHuK4axW7s6+Cq1SiolDJ hdbQ== 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=ubNATQbmg8iLajRmP4P0Pz9JUdOIhvXA6u0rva7SAvE=; b=SwHb7wXW31vUAe/BodPP+5SO2lyn0B0/0YyG3ZU1rbVL9BqPtPNXKNcKNAks6ZkyVq 06rsI7/GahxKUMoE8ootAMPOdV606Ddq0OUXzL3vq4hzZTRjLrR2HFvUbfFKufsWmx2o xyAJaoYer0PLQLBIHC6MUrBdhpQX3K8joN3j3yILkdNXB7WAcglnYQza18cDMJE/vnrZ OCOUhmIHTaWnPDW8gVi2AmZdM0teB/dLCr97Sn34kdmABYRyl6/PwTbF4UVkLIrSGYme hB0kjsAAYNzg58/jMsVbRzg8+Ade5VOXERkB09mUafnPu+B8DxbtvZmmorOjDe4gdOyD EMCw== X-Gm-Message-State: AOAM533FgonLOW61YLxo08DdCOhW905nbAmIIvuYrYu5NK3hTo8YU6k0 VDzF5t36fnAobYMjcahuSP8vNHg5ccKycD3W X-Google-Smtp-Source: ABdhPJyVB5eWyupNF+0q/ZD8muqjSINuDZwyE5nz4+QDqtlAXOXUwvgbLfeY5vLUYlbipOjOqoHH9A== X-Received: by 2002:adf:ecc5:: with SMTP id s5mr19180471wro.423.1612787913370; Mon, 08 Feb 2021 04:38:33 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/16] tests/docker: alias docker-help target for consistency Date: Mon, 8 Feb 2021 12:38:11 +0000 Message-Id: <20210208123821.19818-7-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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 , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210202134001.25738-6-alex.bennee@linaro.org> diff --git a/Makefile b/Makefile index b0dff73904..d7fb6b270e 100644 --- a/Makefile +++ b/Makefile @@ -305,7 +305,7 @@ endif @echo 'Test targets:' $(call print-help,check,Run all tests (check-help for details)) $(call print-help,bench,Run all benchmarks) - $(call print-help,docker,Help about targets running tests inside containe= rs) + $(call print-help,docker-help,Help about targets running tests inside con= tainers) $(call print-help,vm-help,Help about targets running tests inside VM) @echo '' @echo 'Documentation targets:' 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 =20 -.PHONY: docker docker-test docker-clean docker-image docker-qemu-src +.PHONY: docker docker-help docker-test docker-clean docker-image docker-qe= mu-src =20 NULL :=3D SPACE :=3D $(NULL) # @@ -218,6 +218,8 @@ endif @echo ' Specify which container engine to run.' @echo ' REGISTRY=3Durl Cache builds from registry (default:$(D= OCKER_REGISTRY))' =20 +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. --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612809019; cv=none; d=zohomail.com; s=zohoarc; b=WFuO/LcP/4ZBy0EcrsN6nWaaMGsTuovP1kuK2K26m3lA1El7/52oJO4Bi66JiLiWh22w2yB9mCfoL+Hx6sPN1S6TFpUOUoWHdj2uPmcJBpQUGn8Ftufuw3BvXsuLKGTY3CNKOINEBeU79nYO3ZK2NWSU3qQ8C/4mKoiQJB8188g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612809019; 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=d8SAynJQad14L3Py3XDAFmtolIKvB3ca7JcHt4TgWgo=; b=BTXJ64QdvO36Exd0rvIhSbKMu+52ZwcWYnPntPslP8RggJ0U8JaZnhqJO0LfV+8pnLT7floH5uXP+/ZLpKq+DcZ3PywNYR+UYi/BuXkWQkAoWv3Duc+2ejKEuxpe0SUo8cnQLrLX2vChth9VH62W3T3Zx/15eIeNUQo9KeWHnVI= 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 161280901973590.69972425160415; Mon, 8 Feb 2021 10:30:19 -0800 (PST) Received: from localhost ([::1]:56618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BIg-0008SB-9a for importer@patchew.org; Mon, 08 Feb 2021 13:30:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pA-0003fq-RP for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:32 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:42572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007jq-Ho for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:16 -0500 Received: by mail-wr1-x436.google.com with SMTP id r21so669451wrr.9 for ; Mon, 08 Feb 2021 04:38:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e16sm3769174wrt.36.2021.02.08.04.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6169F1FF93; Mon, 8 Feb 2021 12:38:22 +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=d8SAynJQad14L3Py3XDAFmtolIKvB3ca7JcHt4TgWgo=; b=FtiiTcn+tp0rl6Lf/BbR88impAXsCEEV48lXn6oB8GcCKTcPsRgHa8kNLxW84NSuiV 9+jp/A7ByhcceNuC7caxclfTZVhoDuueH3RBiPwpxgf67YiNSc4PoCdoHkafngOfCSHy 5z36ZBxM5TLVpqRRqDnLCwuk2RUqJq+YAYTvDj89fEq8UhN3mtlFajSf0IdaCn4YrWMw 3/5tZYiz0dOGC1i3p92UxCoiggJ5B6TZQbwPvCGr08CZCqmnpWfAnxmLPNNBUWAmepnu urNv7/LP8yZnvEZc2geA6vH51B8WJHDsnOqXkl1Z4jiftpCLJjnnoEdH5+X8mGj9lLl4 Aafw== 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=d8SAynJQad14L3Py3XDAFmtolIKvB3ca7JcHt4TgWgo=; b=jLd/uYJEX8FowLgWuuOcnHtdnqzl5T1rfZZAsXKxcQumCq+txLmNqWD0olKFMCn/GP c1g3lDRHXSawbAmiE0V1TviwfGzLJJc0kBq3dQWX1OVBtJ3rRaW1rRdis2vAtIYjBGqy CnYdlZ4A8OYdB2P2jeRPA1qFvrpYdz2BQmiawxx0wKWwecvVpKOoKPbb5WsDIHstruL7 YY2/SUHOoXPQq0v2MxMfH92zHl0b4WZEhIjd8Dyf+FJMRDu/VfJWghMtiuJAw07xLhKY o63n9w0mjnRUcS3uHkOsEwPygcWVHmZFj1ZrLeXSMTATl5jQ8Ssa5WK8PqRxDFZQhMAq eUfQ== X-Gm-Message-State: AOAM53379gNCsNwnbyD0eDFXQpOY0CaqnMR/crCQdFWWA278mZYdG116 t9Dq3O6YzEgQNvt76IGlAg1bUA== X-Google-Smtp-Source: ABdhPJwQ/xxsbteBDC78JcWRydwHCzG51cHYHNxVB5az7ZD13+D9Meu+crp6c0YiFFjIpq+XBW2RDA== X-Received: by 2002:adf:bc45:: with SMTP id a5mr11741218wrh.290.1612787920142; Mon, 08 Feb 2021 04:38:40 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/16] tests/docker: add a docker-exec-copy-test Date: Mon, 8 Feb 2021 12:38:12 +0000 Message-Id: <20210208123821.19818-8-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; 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=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=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Message-Id: <20210202134001.25738-7-alex.bennee@linaro.org> 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 =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 debian-bootstrap +DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 debian-bootstrap empty DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DI= R)/*.docker)))) DOCKER_TARGETS :=3D $(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")) =20 +# These are test targets +USER_TCG_TARGETS=3D$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(= TARGET_DIRS))) +EXEC_COPY_TESTS=3D$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS= )) + +$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.doc= ker + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ + $(if $V,,--quiet) --no-cache \ + --include-executable=3D$* \ + --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 =20 # 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=3D"""Specify a binary that will be copied= to the container together with all its dependent libraries""") + parser.add_argument("--skip-binfmt", + action=3D"store_true", + help=3D"""Skip binfmt entry check (used for te= sting)""") parser.add_argument("--extra-files", nargs=3D'*', help=3D"""Specify files that will be copied in= the Docker image, fulfilling the ADD directive fro= m the @@ -466,7 +469,9 @@ class BuildCommand(SubCommand): docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") =20 # Validate binfmt_misc will work - if args.include_executable: + if args.skip_binfmt: + qpath =3D args.include_executable + elif args.include_executable: qpath, enabled =3D _check_binfmt_misc(args.include_executa= ble) if not enabled: return 1 diff --git a/tests/docker/dockerfiles/empty.docker b/tests/docker/dockerfil= es/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 . / --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612809342; cv=none; d=zohomail.com; s=zohoarc; b=NN+saY1sfKOz6RNlUdwulUZbL9SoSaboeLsy/LufeBoJlrI9iZx0JoWMs7FQT4DOSzOln3GT/hDuFhP4krZh/DoHs8ER4ZzQvaROsEf++IqT882FEe+GyU2EKabFPHnnn/uG4QCWSpD1FEjNRctpOVdSlqkMsOkapA09i7X0kr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612809342; 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=RoLaaNadYsRBQ0vAb9s/24y/SZHflLdIOBsYDO7si7Q=; b=kpOoX+i99hMnddW7UE0IeKhZFTQkqAgjewLRGRrgY/BafsffSWNhdUNktmhIBy8WsO6DxvzFudylqj7yTC4lDPP6klnF3HbqgyEMwPjwSBRzvMK/AvB9U9UMlD3UM7oDksrgbUJ4VYviBOpioonYT3XFeK9sjNGO2gwia+62BjY= 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 1612809342184335.1856010078843; Mon, 8 Feb 2021 10:35:42 -0800 (PST) Received: from localhost ([::1]:45366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BNt-0007A8-1i for importer@patchew.org; Mon, 08 Feb 2021 13:35:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jy-8R for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:52178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007jk-L7 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:01 -0500 Received: by mail-wm1-x332.google.com with SMTP id t142so10290400wmt.1 for ; Mon, 08 Feb 2021 04:38:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a132sm21159311wmf.42.2021.02.08.04.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7ACDE1FF96; Mon, 8 Feb 2021 12:38:22 +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=RoLaaNadYsRBQ0vAb9s/24y/SZHflLdIOBsYDO7si7Q=; b=SFh46pUv8bG11H+AGpkQlYuJrSimUADigf1IARd0lGq/KtAlJjPeDz3REJQpIafiXu Q4dLVSde9LHqlUOuiEsRGiLA/E0X0OGVgH6k9vt5NmZusTMvLw8qiRc8y4GmItwfVhSX d0Dal10C6ekh/IUNbQc2m1Qc4dqPsiDwLPF4tkRH2kKArfXraRmCEIxEZzGNmzArSyrt tY9pcrOPRNZlQ1Yc/LwOBHb1aHjo9P9DcTXR1NtEJ2Bv+RjEP3WuE55USDQuu4gIOQ5y hGwQdOrWYcFot6zAhf+yWu9KTm2p3GaBrMNFSvTPPDvR5IYnBdkXnOtQLyFfF3C/wFSc PKtQ== 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=RoLaaNadYsRBQ0vAb9s/24y/SZHflLdIOBsYDO7si7Q=; b=ZFBXN6+4oSVNJwKsiRj4hxnC2FaKOoUsHf6LXDtkpX6tqXnw+Lj78g8hh/OEhSe7aR 7Qm0B7fuZoBAdzmaRn43Gl+Fsr9w0Bb7IC3m0IvOfF9B7kIygW67jFd+T4uo5AIGMzD2 Nbt47xK9A+DyRyH5R0e7NZbJJHDIY+CBboBivnpQ0cYh92cHYHbo+r17YS+1FkOXLqOO 0EMuybKwhEwoz0d6UNGyBrKmHLDt81uRJsn2G0focUu8Ts6OCLQxMjuryzMoSazEXMoF FVvB9ilPkXd0IEKek/+r/iUDg2VdRYL6bcqT3aGQqVhY548bk1EwX6WjYWTZYbFTMoEh 5QXg== X-Gm-Message-State: AOAM533ZQ6CcGx3pljqyxBb+bx6Yg8K5bqwLcq6xDshUBqk666rA9HZG YanMJr+2t+e1IhO3A34oCSI0CndbZ99cvMYn X-Google-Smtp-Source: ABdhPJwR2BkMZgaJ+WzOSnZ9wVw67DJY7CBYxmF+64EoWRcWNulnRdKxnLbFOugKZSbLjiItCmXMDA== X-Received: by 2002:a1c:ab57:: with SMTP id u84mr15045031wme.115.1612787918007; Mon, 08 Feb 2021 04:38:38 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/16] configure: make version_ge more tolerant of shady version input Date: Mon, 8 Feb 2021 12:38:13 +0000 Message-Id: <20210208123821.19818-9-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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: Paolo Bonzini , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9e Tested-by: Thomas Huth Reviewed-by: Eric Blake Message-Id: <20210202134001.25738-8-alex.bennee@linaro.org> diff --git a/configure b/configure index a34f91171d..36036aa2f2 100755 --- a/configure +++ b/configure @@ -198,8 +198,8 @@ has() { } =20 version_ge () { - local_ver1=3D`echo $1 | tr . ' '` - local_ver2=3D`echo $2 | tr . ' '` + local_ver1=3D$(expr "$1" : '\([0-9.]*\)' | tr . ' ') + local_ver2=3D$(echo "$2" | tr . ' ') while true; do set x $local_ver1 local_first=3D${2-0} --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612810579; cv=none; d=zohomail.com; s=zohoarc; b=KmjVV6G0CUuoHo8/kBYjldQWZcYa8GYOEYZ8zydsOJ6u2wVxIDgi0Lh0kpCOn8/t/eCClbY2AlLuvqcMvSw63ZDmxK/rqwtfVapyLdYXpyIX55V6QLGNzwp++6ohBQEMtaJ36p2Z4cQ8RyK7LXhuZgOjL/GnrG8qwD/ku4//rBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612810579; 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=KuHSv4f+eWd3LUAAxodJ01HAzlmeXXXkmri5CwIIPdg=; b=J9uknbBIg4NtIwInnQ82aaoxejyXVLaxyS4ApcGjMcVMaopwsIQw1yBFEqSbjALXpxrSOojlEBs1pBrtFUCZaqeOb1fSVq0wWy4yH4ITqz2Y1QOWZfG1G6JOrZhZKoqM4B2FOXlvrvWe6LI3f+LDOUi2KjTs9UVEGxn+PG316Mg= 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 1612810579306107.08041064148699; Mon, 8 Feb 2021 10:56:19 -0800 (PST) Received: from localhost ([::1]:52190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bhp-0006gc-VL for importer@patchew.org; Mon, 08 Feb 2021 13:56:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95q8-0003n0-7U for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:30 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:44313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pQ-0007kf-In for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:14 -0500 Received: by mail-wr1-x433.google.com with SMTP id g6so3913306wrs.11 for ; Mon, 08 Feb 2021 04:38:43 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z8sm27763630wrh.83.2021.02.08.04.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 902B01FF98; Mon, 8 Feb 2021 12:38:22 +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=KuHSv4f+eWd3LUAAxodJ01HAzlmeXXXkmri5CwIIPdg=; b=wSK6i0wNCZ5EbK6m2GCZ5gIyAn7gYssRaNHqR3MdrAANvACeml+jWV19CsBeTSycMi QUQCYuSBBW9tmrfzrnaibyIDe0pTHcxSV4y8uQPyMEEHOqYKGuuKs2fIEUSkpWl5GJGT p+yyPEaEebGyMPdggbO/trzJRGGKTcLpZ3lqVBwINJDKUs5eXAoSkMACja9PFqhtprJq R6JKsk7U0PHAjttQuT+Rc4rDEO3sVbLYKJ2xX1GsCdgr5HHCS6BDgOpKjvcniWSGUS5l PqjP4t1j/uxfZYKmq9E8fOJj5ZbgxIhnvRrFlChX7clus73p/5yxSalg8BupfZK9+o4P S+Cw== 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=KuHSv4f+eWd3LUAAxodJ01HAzlmeXXXkmri5CwIIPdg=; b=Rvn7LmgbeBRy7zOH6gDKTE7jSO7V6Jls6ckfDYne3sAEhWeaK9gBim3rVtAkwR8Nrt qaexMSgmN2qPjUIsfZDuLVl0hEY4lB+hOsPK0weyMtRCmXPxcDQcilU0FSsI8PK2Iecw 9IOAiC6UwkRj3b3O3AkZrTIOxZcBxoQl3wjExyMw+Ee6U1F3SqyjmMNeLps7+uV0QTXm ZDoCxyeDSu8lwXM2erDepQ7IRAHH6hjdoqvI2tPRaqr4rXNty7SnSsUedaaraN1EJ8FZ yRZKPPg05So+m2OzselbFH9e+PiQuSNDbWqZMiFfUiLXf5UoYF2973eJSRUTUutaQQRT zd3A== X-Gm-Message-State: AOAM5320o1hIOJb0mygd/EH3nVHyROp2RN2jMXqf4StZ4mFOGCOx8C/R 5oHrMY2nLyu+YniZl5/g53IqNA== X-Google-Smtp-Source: ABdhPJyzHAubfaCRE3iTeTxTZaPZWtLvtAx9JL4loD+ZlamnJ9573YP8pHaSQdE2XZ58+U7sSt+ziA== X-Received: by 2002:adf:9e47:: with SMTP id v7mr19368896wre.185.1612787922515; Mon, 08 Feb 2021 04:38:42 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/16] configure: bump the minimum gdb version for check-tcg to 9.1 Date: Mon, 8 Feb 2021 12:38:14 +0000 Message-Id: <20210208123821.19818-10-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Claudio Fontana Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Signed-off-by: Alex Benn=C3=A9e Cc: Luis Machado Message-Id: <20210202134001.25738-9-alex.bennee@linaro.org> diff --git a/configure b/configure index 36036aa2f2..57813eba7b 100755 --- a/configure +++ b/configure @@ -6115,7 +6115,7 @@ fi =20 if test -n "$gdb_bin"; then gdb_version=3D$($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=3D$gdb_bin" >> $config_host_mak fi fi --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612810432; cv=none; d=zohomail.com; s=zohoarc; b=BFe/pBKk1RwoH1HfELdXrevgZnCOuiy7g+7HVZVqeAjlZHWlUgmZRYSZGjy2KpDisQk1AphWViDKob7WsHq5u7Oeq0td8G5laCovkV3jqsp+0KqfizV0B0HwfyZ9k2m11nXcJklBxjjs7TjxkVaIYZAOQt1aSKfFpHFC/BUemu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612810432; 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=w377RkShWfYVKD5bSJML+f06uux+L2r7mDqZb6Yuoo4=; b=ddS9vBDKIvgpuHJkCZ31HAFWgOp+O5hh1ZTEyIWc29UZ9trV3CJsX7pyWHHAYTlAZ5v2ZZf6AEFfyRAou/bUHV9PoKRQ1ptVVW5wwYYP2EKKTU5zrDIcJx1JHU5YUUBFULYnSSqbBevROp1jQl37EpmUjjGHxlpVX5Kq6uN6ZoM= 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 1612810432524155.34735067456177; Mon, 8 Feb 2021 10:53:52 -0800 (PST) Received: from localhost ([::1]:46536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BfT-0004E7-C6 for importer@patchew.org; Mon, 08 Feb 2021 13:53:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003kb-UE for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:08 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007jX-L6 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: by mail-wm1-x334.google.com with SMTP id i9so13116270wmq.1 for ; Mon, 08 Feb 2021 04:38:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y83sm20911258wmc.12.2021.02.08.04.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A474F1FF99; Mon, 8 Feb 2021 12:38:22 +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=w377RkShWfYVKD5bSJML+f06uux+L2r7mDqZb6Yuoo4=; b=SAnp8WD9hT6AkGAzwTgjyg4A40rKC0LWynko9+cvG3T0aJvIAiKoMY2OEKZpCFld41 GB/sij7w0XRBqHt4pcM8xl5FOH+/YPXt6OGQ9D0IO0jDlIoesVPu2hr2wZbUwYIsX00c lL9mfZxarEm3ky9oMnnQ7Mpx8x6j5kBlu/zZvczGx1A6tCA3Rnb4P4OY/PZp4CJK9Pz+ Q6RlPJo4OGRMRJ+oeScLyvl75V1fbKDL27BBKwkCn78f16ht/1XZ/X2ArORyoVDmmBhX m9njKkLHPdNE+MCyeRT10U+WuR0W5yQ+aDDc2iBn0sdD8cl+vi1/OrcFBUlYvarjfST4 EQbA== 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=w377RkShWfYVKD5bSJML+f06uux+L2r7mDqZb6Yuoo4=; b=Oa/hRaqpBGiXjed2KasD/e33wiXzIrX6/v6+z+k1dRanwdryN2FeCjlv8SueVjm3QQ O+NhdNA9l0WKCUUvRJO0OwxCV+frWTxJOfCWBJooC5dxc1c51W0IE/+rZMrHPdnmmYyh OEtbo3Zefi1OkPPwcGe8oJXPIgFhTWLuXxpDTZ2pscth+TzW3bXf5ghvTPhOyhT3yq4b T4/sb5Nw4ur5PJ0MpMhj/Iu+s6JXsHqfHc4FhvbPxXIb2wBexyBVkhPEauEsQRkj1/Hi uxoLERoqgz9a+FnTryZBVRZNrzz8oi+cAAA3zawV6mFIe38vbMwt5Qet/jDxcr5dNYs2 QXFw== X-Gm-Message-State: AOAM5338S94vmw+Kl+LJA+IBjBl7kT5u5kohSiiDibR1iXCY1Gx6ikOj O9BFcKJFqu3fZURFZGqMN0lK+w== X-Google-Smtp-Source: ABdhPJxnMNFzesyVVYQa/s+LDy32tkoOwjlTDR3cCH8rIXbO0kyP/AEvnW989gxuKa3qbGKppm87fQ== X-Received: by 2002:a1c:de54:: with SMTP id v81mr14563019wmg.181.1612787919073; Mon, 08 Feb 2021 04:38:39 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/16] tests/tcg: don't silently skip the gdb tests Date: Mon, 8 Feb 2021 12:38:15 +0000 Message-Id: <20210208123821.19818-11-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Otherwise people won't know what they are missing. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210202134001.25738-10-alex.bennee@linaro.org> diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index 1dd0f64d23..abbdb2e126 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -63,8 +63,11 @@ run-gdbstub-qxfer-auxv-read: sha1 --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-qxfer-auxv-read.py, \ "basic gdbstub qXfer:auxv:read support") =20 -EXTRA_RUNS +=3D run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read +else +run-gdbstub-%: + $(call skip-test, "gdbstub test $*", "need working gdb") endif +EXTRA_RUNS +=3D run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read =20 =20 # Update TESTS --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612811597; cv=none; d=zohomail.com; s=zohoarc; b=HP88VT6S3gU+z9M12UUCqPhAxqwX72MzhNjPojspJ854+/vFSal2vp8KYo77kN/tEiv2FBAARCTLWF6GuqkaTpPSGuI3RJrX7FhQH31kbK/Ae5WhmA06eYT0uBHjaQFGvq9jC+X69fOPoQTg491emA1BN10/FgJfVGTR+5n7y28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612811597; 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=NRda7hohv+ORS/AyN1sYb9iTKw761l7PAGPzaaV6iHY=; b=BtkcTXw9p9OBGSlx5ObSEbIKT3FSoYa4fhHYBZ8KYybdh7jBd58lZIWQMXgMOQ06NI5dK2qebABNcgq66L+7RTcMwD1Q4T089G8YTYccxZLjcqeri7ntXqH14E0LQXOBTMaISN0PeC1oFf4hnF1bgrm1W83Jf8yF1Ys0iW/X9+U= 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 1612811597008590.9829455478883; Mon, 8 Feb 2021 11:13:17 -0800 (PST) Received: from localhost ([::1]:45812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9ByF-0000jz-3R for importer@patchew.org; Mon, 08 Feb 2021 14:13:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pE-0003fx-EY for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:39 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oi-0007kk-9g for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:22 -0500 Received: by mail-wr1-x42e.google.com with SMTP id r21so669687wrr.9 for ; Mon, 08 Feb 2021 04:38:44 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k15sm20168078wmj.6.2021.02.08.04.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB9F31FF9A; Mon, 8 Feb 2021 12:38:22 +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=NRda7hohv+ORS/AyN1sYb9iTKw761l7PAGPzaaV6iHY=; b=yMc8TcunZRgGeRtGNmhWgxR56Jp0jPpdaqo8kGLH1Zf/pId7wXkAQqfmMaKcDsKEAJ v4LOeoXqCGwZyyAUPkrjCAJwwYXM5PvYTZzCqCBXwwZ4Wxms1/UzlAO2Nfo8vB5vv7AW tAJLFkUpTKQMquR0m4j020eRejweGzqALAGVoOvMlfyoz7b7JDuL3oWSOswY3fwVXTTu D5QPbQbrifAjoUvZ0HJdt9TPZCmHUuVEJjsWQFOL7XbUVtCj47JPYfpJ16mhza6fJv7i pN+rZs83IjM9KJANvw6NZYZZCBWxnclDRUv0Nni777lcvafPmW+DKZ9mINF6uQ2D/kQb /nDA== 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=NRda7hohv+ORS/AyN1sYb9iTKw761l7PAGPzaaV6iHY=; b=FD5zX5JZKn8/k2mz5UIIk7UxECqI5gu1CBa5aNFWJrl/jetcOQJcB0J/9YryfoseCw lDeLhRuQO2sTLBkMzeZMekj+J3DklcloDk9sYDc3eD1f+omoS3GUDWvRj2B3vcdWQlsF r4Cw0dxtOywoPzAPzEEK3EayqPo+H6qn8DRRB5LXlb2F9fHZX7XItSioyfDenQ5cedpT ZAbFDAkLuBJ85FYgKYR5mQ8+tigSRGd/fjOipgBRZ/2VYZoDJ/0QZqAYozOAvfBlSLNp NXc6udMq59WmDqRjSYdaTQ4LP9WAJ/+tjQL6MLFWGi8U3EoP3td01/Sq+43gyVpZDAWy N9lQ== X-Gm-Message-State: AOAM533qMjtql+PSl8UFyuAW7ubH0n3/Zl6q1Lx7z8JlpDHzJY8dMq/m vVc/MlitQoRirjMoP/YcKzJjLQ== X-Google-Smtp-Source: ABdhPJyA2vmeGabSOdoyZTAUOJyW2ebbOKnGb9hGy3lryUiQRsAZcajA6ynoVr2TjNs9SOfeb/cQBQ== X-Received: by 2002:a5d:4383:: with SMTP id i3mr19822242wrq.293.1612787923465; Mon, 08 Feb 2021 04:38:43 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv Date: Mon, 8 Feb 2021 12:38:16 +0000 Message-Id: <20210208123821.19818-12-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Richard Henderson The main problem was that we were treating a guest address as a host address with a mere cast. Use the correct interface for accessing guest memory. Do not allow offset =3D=3D auxv_len, which would result in an empty packet. Fixes: 51c623b0de1 ("gdbstub: add support to Xfer:auxv:read: packet") Signed-off-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210128201831.534033-1-richard.henderson@linaro.org> Message-Id: <20210202134001.25738-11-alex.bennee@linaro.org> diff --git a/gdbstub.c b/gdbstub.c index c7ca7e9f88..759bb00bcf 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2245,7 +2245,6 @@ static void handle_query_xfer_auxv(GdbCmdContext *gdb= _ctx, void *user_ctx) { TaskState *ts; unsigned long offset, len, saved_auxv, auxv_len; - const char *mem; =20 if (gdb_ctx->num_params < 2) { put_packet("E22"); @@ -2257,8 +2256,8 @@ static void handle_query_xfer_auxv(GdbCmdContext *gdb= _ctx, void *user_ctx) ts =3D gdbserver_state.c_cpu->opaque; saved_auxv =3D ts->info->saved_auxv; auxv_len =3D ts->info->auxv_len; - mem =3D (const char *)(saved_auxv + offset); - if (offset > auxv_len) { + + if (offset >=3D auxv_len) { put_packet("E00"); return; } @@ -2269,12 +2268,20 @@ static void handle_query_xfer_auxv(GdbCmdContext *g= db_ctx, void *user_ctx) =20 if (len < auxv_len - offset) { g_string_assign(gdbserver_state.str_buf, "m"); - memtox(gdbserver_state.str_buf, mem, len); } else { g_string_assign(gdbserver_state.str_buf, "l"); - memtox(gdbserver_state.str_buf, mem, auxv_len - offset); + len =3D auxv_len - offset; + } + + g_byte_array_set_size(gdbserver_state.mem_buf, len); + if (target_memory_rw_debug(gdbserver_state.g_cpu, saved_auxv + offset, + gdbserver_state.mem_buf->data, len, false))= { + put_packet("E14"); + return; } =20 + memtox(gdbserver_state.str_buf, + (const char *)gdbserver_state.mem_buf->data, len); put_packet_binary(gdbserver_state.str_buf->str, gdbserver_state.str_buf->len, true); } --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612811162; cv=none; d=zohomail.com; s=zohoarc; b=jENGKgzdEh79TGzoQitppZxwvPGzeDCmi3BhhuSg2madukIqIvHQaBmMlRkmmoFB9GcZ729eP2clXdX4Xntt8zGJ8S/898jMTgdRwmQzy5xV6XhLDMCPrvgZSDmoFoEirNTtKrYer+oBBSrAFa47xJ1iqZxBUsMIQd95PXyMOFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612811162; 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=fITS/ZIRcyY4uQvc1wHO8nnou5g7xUQ3JpD0PLMi4/A=; b=C/PU4GiWLAaBS285VLPMW2BN7tB37xQNaVXiYTSX94S3CPRwCKCTsJzFuyDhX0aD8bQbyDgcVqyfqFs30mwUKLFnjIfIsrpprYSJ6v/W73wsvmos/qPfHjPhcOjXnyxfyNW37xx2C89lZqtfSGfalf4wrrILqNbDxIdc7PxEjXs= 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 16128111627151023.6780911292251; Mon, 8 Feb 2021 11:06:02 -0800 (PST) Received: from localhost ([::1]:37320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BrF-0005CQ-Ce for importer@patchew.org; Mon, 08 Feb 2021 14:06:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95p2-0003eO-KO for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:28 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oa-0007kv-E1 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:09 -0500 Received: by mail-wr1-x435.google.com with SMTP id h12so633107wrw.6 for ; Mon, 08 Feb 2021 04:38:46 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r1sm28306828wrl.95.2021.02.08.04.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D33571FF9B; Mon, 8 Feb 2021 12:38:22 +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=fITS/ZIRcyY4uQvc1wHO8nnou5g7xUQ3JpD0PLMi4/A=; b=MHpV/F1e3taQvaVt2aNvhdTx5HWpgcuR3C8AF/6Mlq7sq5DnOX+2bggoMTLvpDHB0N SjiY5PF2doV1Z/ojPhp0VcT5LiTX3mycVzh0pXsVEJngJZ6QeZx7+ZALUYbAofMTM5w9 3btaEzqte6LNAf5rNgWEFmN/naA0df+Halm5PngEb8fJ6KiOs8e0nmNdyFkwNyWJ6s+P ig2cq6/VlCx5SEA/BXnnsAnrRvC4j0reulGDO4TupbNwu3g7IlMNghgnqHwby7kdXN6e uPZ6td9o090GDqYKUL0JJQf0v5W3N/80b/dKZec6V+vVwQMh+RfRC42yzHMnAq7Cr/wQ egqA== 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=fITS/ZIRcyY4uQvc1wHO8nnou5g7xUQ3JpD0PLMi4/A=; b=J1nJ88sJCc5ESDkoRL8DVm7a3whdxko8rlMrcX+s7wFnrm1OTC6Vy7re/F5ntf7yTj QzryEo+kiJk2YFZ47Cm7Gx7071TfDhF4gzhb5YTWNPloVlmoUG1+hJ0AWTeC9vdA1t+T veRs3MRBqdnrIs7GDleG55cRqP31uzfJzqlqccvGF0lwSFQIHn2jEjKxrWeG1OwbMynt WcA87BoOPSCjFw+B0evuqyESe4eejCHurvX/oxwlMWxpeS3xNtOcZRHtgpbKSbo5JJv6 Gsz3S8aayHcnnBxBsvg2IaHO7+XJGGM0J4F89KZdUgUqjnRNi+Bnd+5TwZUcxAgxovE9 xfkA== X-Gm-Message-State: AOAM531X8Siu0yfFnLycx/qjnngHehtU1Zo2PJN7q9/yicTzomA7Ng4u ZVxqy7t02XmnnExwD/RWWe4Olb26NbhEyyHv X-Google-Smtp-Source: ABdhPJxA0CbMS8ALe0z3hOlQ4rAtJOvSWXGV4ZBriCrfrldj2+O57MoLQckP2J7yVQ0DGXH9YIIvww== X-Received: by 2002:a5d:518d:: with SMTP id k13mr11961029wrv.158.1612787925302; Mon, 08 Feb 2021 04:38:45 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS) Date: Mon, 8 Feb 2021 12:38:17 +0000 Message-Id: <20210208123821.19818-13-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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: Stefan Weil , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Weil /bin/true is missing on macOS, but simply "true" is available as a shell bu= iltin. Signed-off-by: Stefan Weil Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210128135627.2067003-1-sw@weilnetz.de> Message-Id: <20210202134001.25738-12-alex.bennee@linaro.org> diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index c096c611a2..a56564660c 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -90,11 +90,11 @@ run-guest-tests: guest-tests =20 else guest-tests: - $(call quiet-command, /bin/true, "BUILD", \ + $(call quiet-command, true, "BUILD", \ "$(TARGET) guest-tests SKIPPED") =20 run-guest-tests: - $(call quiet-command, /bin/true, "RUN", \ + $(call quiet-command, true, "RUN", \ "tests for $(TARGET) SKIPPED") endif =20 --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612806214; cv=none; d=zohomail.com; s=zohoarc; b=Ef56as1S9pwW3PrNjYcIdpLsgG8Z+Kn2jt+IpNP+5fz75EOqo5A/7c0uZTPODWJVu3+0vM9hbtg0xnkdhpNXiEqFrwk6vFcFtq99/TdhOr5nTATyhwyyRDlPnWPRGZ4hrHJs7QWkHSInixD1oKcEKXZMmgMbWl+R4CWLXCyCmUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612806214; 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=9FElUemn7vDCwadfEV9vU0VxAeiUTnu6ontpp4bH2YE=; b=hN0w8KwrTK6V3naGay1DFu3lRPKUgMowfj/qeJS1GvFfOz1YMJcIriTX8fdGgn0OeK6UZ/Nar+fnz03PBIFBslBz3PWrkWcqGIxvaPCDAxrao/nvZ19tkCMn7KkWGiy+LP5c+wFp1IDV8nPN4PxYMoTPIIRLHPKO5P8fFv1nGRk= 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 1612806214599745.5239266695146; Mon, 8 Feb 2021 09:43:34 -0800 (PST) Received: from localhost ([::1]:50516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9AZR-0007Kd-CL for importer@patchew.org; Mon, 08 Feb 2021 12:43:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jn-5Y for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007lC-L5 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:52 -0500 Received: by mail-wr1-x435.google.com with SMTP id z6so16846773wrq.10 for ; Mon, 08 Feb 2021 04:38:48 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14236284wrr.3.2021.02.08.04.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:45 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EBF0E1FF9C; Mon, 8 Feb 2021 12:38:22 +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=9FElUemn7vDCwadfEV9vU0VxAeiUTnu6ontpp4bH2YE=; b=TSEt0WKfL860V+xI8eED0cDdzVTqVO6pGiQDX5nO8GzQ1Rs/ZP2VuIl0xuLfUMhfvI 7W5qFsrQt7DibXY7z0bV7TO9TExJ+uDA4JvT1Gz68S72Mj5zSC65mlIHs4cqGPyjCF+M yYEriNZ/22Gl/oiCKVz5KU9yrIbcWa6TKf5dOWRU78NnDzcDPZX4Pxl+Cgvwu+AKQNKW fZdLuhFhjNnNPoxTEBzJd/FDi7Otcc2u6yIqa5wMYqQY65JTMtPH05JxA/6APhrZQbED EV5yrV1tYZMRVsTsZfpt1fey4DLY7HxlmAjQFf/l8wqeKmf1Y5nkUgJsFtW89oJRs0RO /kgA== 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=9FElUemn7vDCwadfEV9vU0VxAeiUTnu6ontpp4bH2YE=; b=XD6IpI0BjqmJDp8m8LmbpJ67oLNPzTmnsXGqHItNkfUf2u0d6vKbnrv8MsXwN6fbEo 3RvWFlN83VdYx7XdjLjgopTy4BDzNTWSeFU0/BeYbFhBR5/rijQ7X3qCGOswNXuHzgEF tczpI+Hot2qIXqMgqXTmxOwIsGgBaO2oCYY8/YWohjY5BiJqOoleKQJyKrAsplVqYt7E byIEkqdBMxPnRwbv1bi81PjO85u6nQXAVewGSRKFqV8Zp1yT7e1ncHt2ZXBp/80JrN9E Uv2u7dDziRKTjC4WQaHUo6fUnnZ7trPUDEiZLI/P0pKVMKvseu8RKrI5riSy7gdc9SHV JO+Q== X-Gm-Message-State: AOAM532AL4eq1/oSej5GpCqn9wmTrEW0Tx8sdplIvzK6njm/9Rq+ukD0 UOlUzD7j1GfNg1CS4i1uCunA/w== X-Google-Smtp-Source: ABdhPJwEPEB74fbW5TTgSx52LVVlc4tOBVmzt9g3/8tWSlH8J2y5anjlM8xHPgVo6170lu/rqz9rYw== X-Received: by 2002:a5d:4443:: with SMTP id x3mr20464961wrr.409.1612787927285; Mon, 08 Feb 2021 04:38:47 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it Date: Mon, 8 Feb 2021 12:38:18 +0000 Message-Id: <20210208123821.19818-14-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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: Paolo Bonzini , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There are some places where the conditional makefile support is the simplest solution. Now we don't expose CONFIG_TCG as a variable create a new one that can be checked for the check-help output. As check-tcg is a PHONY target we re-use check-softfloat to gate that as well. Signed-off-by: Alex Benn=C3=A9e Acked-by: Paolo Bonzini Message-Id: <20210202134001.25738-13-alex.bennee@linaro.org> diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 25ee6887cf..cbbcba100d 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -110,6 +110,7 @@ def emit_suite(name, suite, prefix): print('ifneq ($(filter %s %s, $(MAKECMDGOALS)),)' % (target, prefix)) print('.tests +=3D $(.test.$(SPEED).%s)' % (target, )) print('endif') + print('all-%s-targets +=3D %s' % (prefix, target)) =20 targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] for t in introspect['targets']} diff --git a/tests/Makefile.include b/tests/Makefile.include index ceaf3f0d6e..17dafdfe98 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -12,7 +12,7 @@ check-help: @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" -ifeq ($(CONFIG_TCG),y) +ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" endif --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612810890; cv=none; d=zohomail.com; s=zohoarc; b=HLUU0RwPqYm27DZEAqTtLN5ToFmIc96S8LGwq06b1z8z+4IqCUOgfv8Srvl4Rlw3li+TB8d+27s6BTBqfOTE5+hvQN8nYUaOemFmNvBASUWEvLBZqffUY7LGoO+FK1df/wkPZBTCkrrKjCjt8HetRSSGQRHfuQWwQ8AJ5nBYQ/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612810890; 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=fZc8/pcIL1JNoWlbKYvFp4P3eVREddnQsSh5KL055gw=; b=AoZdI3hgq/+dLpeH/mpRV8+qlprksF5rgWlChgY2+XaSdDe17+C6YqaLvmMQVbjfyJI3yuV7dWudBqDmTHonB6uoCrBrqxKilPQxB0GrfYaG/1ZiGSxn+kOuNKQ3AuQ/YSiTkKk8S1oLztv5xpVXwBwFg0KOaqPiD5ytwZd1wLk= 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 1612810890328813.6645473618471; Mon, 8 Feb 2021 11:01:30 -0800 (PST) Received: from localhost ([::1]:59064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bmq-0001W4-Ci for importer@patchew.org; Mon, 08 Feb 2021 14:01:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95uk-0004Nd-RM for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:16 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95uV-0000fL-2R for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:07 -0500 Received: by mail-wr1-x42b.google.com with SMTP id h12so658222wrw.6 for ; Mon, 08 Feb 2021 04:44:55 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u10sm19876441wmj.40.2021.02.08.04.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:44:52 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 105CC1FF9D; Mon, 8 Feb 2021 12:38: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=fZc8/pcIL1JNoWlbKYvFp4P3eVREddnQsSh5KL055gw=; b=aA1o84fqZycjL2AGaWmi7JYy1jSoYFV0htXgvvJ3d7HrFfFUEEFHGPsTQgqcRoUzLu 9LLF6kGWwZSAXyNFb3e27ZGvyb7aNcucbojGye5dtJPStsbU7DnQHr0bT5GX3VbcMHeN TNEKVrtGGxDMkE34V5hg0PCY4gwsQ+8sazr6JKGGi2oxc/MDim0s5EhFYHU8ia40kVuo RVmhEOjpWRdHsa4ecbdUe+9KqCE0MYWqB95m/hq7fWF+c4pMebQ4/7lQGKfhUnssRe72 Ww2AhW8HOUVWovoeM9VQBVU0H6RkbjY8q1JpMQPkg9cLMAdVHsx/6UM5dZyeLjZ0lhn2 3xCw== 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=fZc8/pcIL1JNoWlbKYvFp4P3eVREddnQsSh5KL055gw=; b=lGqFxM9Pc4QBawJ8r4Z+i45qbYih/Id0GstWAOY8rCCCoucmXAOgOz+iwh1ljNE7ip aP3fFXUHp6vinCDtzg9ZgAZBSWYn0SwWYunzDaWaEMsMOXqO5vkD3XYbVOYFTLXUvMgc aYsGvoqKl3eoYTA6iRImi/XY4L4gRWpycG1qcpFeePi+/rGVg+hXSz8BoJju8RcTDftC rExik0bS1nFCXc3FsZvp+kbc9dMLti/+tIFPXEoITfK8KflVCk5AfvUdXMm7ewUBYk57 iM2iZscVq5OzvrruQqankTP+6oNWK1NCvWBDYqaPni4YyFL0Qg806EkEJ/S8kb3XDRoq sJXw== X-Gm-Message-State: AOAM530Rtz2+RwIfaCBgfkN5gXDqxKc3s0kcz86+mZpeIFXlawXVtE5J cIobtekp3mCKWxMvwAkh9PdglCSf7sbWa6V8 X-Google-Smtp-Source: ABdhPJw01ve8NjNYAwA8SNCyJo29KkpnQDeLYZpX+lmBS5BBATJyC2BD+Bd1cVN3+XfqozvA1QC4Iw== X-Received: by 2002:adf:a59a:: with SMTP id g26mr12483429wrc.271.1612788294766; Mon, 08 Feb 2021 04:44:54 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/16] tests/Makefile.include: don't use TARGET_DIRS for check-tcg Date: Mon, 8 Feb 2021 12:38:19 +0000 Message-Id: <20210208123821.19818-15-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) TARGET_DIRS reflects what we wanted to configure which in the normal case is all our targets. However once meson has pared-down our target list due to missing features we need to check the final list of ninja-targets. This prevents check-tcg barfing on a --disable-tcg build. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Acked-by: Paolo Bonzini Message-Id: <20210202134001.25738-14-alex.bennee@linaro.org> diff --git a/tests/Makefile.include b/tests/Makefile.include index 17dafdfe98..d34254fb29 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -40,11 +40,13 @@ SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ =20 SPEED =3D quick =20 -# Per guest TCG tests +# Build up our target list from the filtered list of ninja targets +TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) =20 -BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) -CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) -RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) +# Per guest TCG tests +BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGETS)) +CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGETS)) +RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGETS)) =20 # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612806557; cv=none; d=zohomail.com; s=zohoarc; b=fwzxjKid9Af3KsBWI5hV3P2PcBqSNAO/E0Ny9xZU4j5LnXsm5NHSgLE5oRHsOzInTF5YLwXOpvyJK59WpkeqgL+vw3CdciXjlXEMvHFNIlIOoECtcjRedu6vH+B06/Jl7w0MDeFtFVbk3u05lrvWsNMT9LYQ0PJ75Cvc78WiNWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612806557; 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=6bc9E/qj8MVrG1lrbbnDCW0cq4qlP1ZjoNfCdUMbKio=; b=aPzxJFdr/wW6jb1ZkNpia4P6G5/E18pzJLqKpZIOLCmA+pTlhTxxdqBNCFaDBgRmdMP7epwgZ5ATxw/tltNSNy6m3BpHK70FUQg7LRu0B860lYGaHdddRl/SqFQdfFiwEuBWEgcDQrSi2RBdpwH8tGw0XUtpglxNhe8RbnOZy8A= 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 1612806557561322.25015389892667; Mon, 8 Feb 2021 09:49:17 -0800 (PST) Received: from localhost ([::1]:34644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Aey-0004OT-CM for importer@patchew.org; Mon, 08 Feb 2021 12:49:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95uX-0004M0-Iw for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:03 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95uQ-0000eW-9y for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:01 -0500 Received: by mail-wr1-x431.google.com with SMTP id l12so16970290wry.2 for ; Mon, 08 Feb 2021 04:44:53 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c11sm27764528wrs.28.2021.02.08.04.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:44:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2737B1FF9E; Mon, 8 Feb 2021 12:38: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=6bc9E/qj8MVrG1lrbbnDCW0cq4qlP1ZjoNfCdUMbKio=; b=fLQ61n/+ea7zzB/PphMljhmU63cmAiwMCJDFiLca2nKvdJPeFMxQlEmdpnNCvobsSS ekKH8ye+Ft5X88617gJxZIkmBVjqjEyIilTMx7icOnxMrcyMYqi/R75Zr7HHrUw+Zcw7 hSpdANhvu+r20WxVJjjeOgGs2Q4xN13Y9krbp95Oi1SFQulS4wZP/RrCTVhRuXSobM9x 8bMVq7xMzbPsOv/6aaF2bMlGS0muBGAk/tXKV7qAFtTnhcI/jpxwECDlhZQhibxKFAzv fwFSUtWB6RFKDLH3C5Lxzt9XuY0u72/Df9c21XwGCX33QZQLkSHMFO9sXfkoeYr2gGN5 T6ZA== 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=6bc9E/qj8MVrG1lrbbnDCW0cq4qlP1ZjoNfCdUMbKio=; b=cB9VC1hP03scwcWP+M6ZJY5WQnfpW46SEBkgOK1PDgSakGMcyWJb+fmfOXmLbqn1gh 5SpmByaFJE8jLBPC84LovXDXrVynqSGR7EKfJL/0bwlXD3T9zcrYDgkJOWAE5GcKfym4 UlJniy9tmxr3IXlcWiB/6La99aXmUmREgQp9dOmV+m+cvP9Jw7z1Wr5U+CfuApLMhV+a yPv3hQvfnCq3pxH+cbrh698XJLQ3LeIcidisJAG2tgGTjZEZ4qMM4DhPC61+zJznQrpv 5k+gKdPESoGNHxLcoGj4MUsaiOZJzDe/qHmsF7SlXq1a0jlMsOism8K7NGkmxAgDgQom mwYw== X-Gm-Message-State: AOAM5326tL/57ynEqB8qqvuWRBmjhW4kqYKIssez8I12P6evANz6qCd8 WTgjDIlukoBHolkp77gNowIdY/nmfTa4BsC0 X-Google-Smtp-Source: ABdhPJyeVKvpQwhiccuH7/wmEk9sCXbrY45cT05PcEPhvQz97Vefx1HUIOGf99pY+i4hTQjVjbqgtQ== X-Received: by 2002:a05:6000:1547:: with SMTP id 7mr19956836wry.301.1612788292622; Mon, 08 Feb 2021 04:44:52 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/16] docs/system: document an example vexpress-a15 invocation Date: Mon, 8 Feb 2021 12:38:20 +0000 Message-Id: <20210208123821.19818-16-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; 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: Anders Roxell , "open list:Versatile Express" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The wiki and the web are curiously absent of the right runes to boot a vexpress model so I had to work from first principles to work it out. Use the more modern -drive notation so alternative backends can be used (unlike the hardwired -sd mode). Signed-off-by: Alex Benn=C3=A9e Cc: Anders Roxell Message-Id: <20210202134001.25738-15-alex.bennee@linaro.org> diff --git a/docs/system/arm/vexpress.rst b/docs/system/arm/vexpress.rst index 7f1bcbef07..3e3839e923 100644 --- a/docs/system/arm/vexpress.rst +++ b/docs/system/arm/vexpress.rst @@ -58,3 +58,31 @@ Other differences between the hardware and the QEMU mode= l: ``vexpress-a15``, and have IRQs from 40 upwards. If a dtb is provided on the command line then QEMU will edit it to include suitable entries describing these transports for the guest. + +Booting a Linux kernel +---------------------- + +Building a current Linux kernel with ``multi_v7_defconfig`` should be +enough to get something running. Nowadays an out-of-tree build is +recommended (and also useful if you build a lot of different targets). +In the following example $BLD points to the build directory and $SRC +points to the root of the Linux source tree. You can drop $SRC if you +are running from there. + +.. code-block:: bash + + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- = multi_v7_defconfig + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- + +By default you will want to boot your rootfs off the sdcard interface. +Your rootfs will need to be padded to the right size. With a suitable +DTB you could also add devices to the virtio-mmio bus. + +.. code-block:: bash + + $ qemu-system-arm -cpu cortex-a15 -smp 4 -m 4096 \ + -machine type=3Dvexpress-a15 -serial mon:stdio \ + -drive if=3Dsd,driver=3Dfile,filename=3Darmel-rootfs.ext4 \ + -kernel zImage \ + -dtb vexpress-v2p-ca15-tc1.dtb \ + -append "console=3DttyAMA0 root=3D/dev/mmcblk0 ro" --=20 2.20.1 From nobody Fri May 17 07:47:14 2024 Delivered-To: importer@patchew.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=1612812257; cv=none; d=zohomail.com; s=zohoarc; b=nXoEBrmeIguIFu/VViFskgJvxmj+EfEX7FeaLHWds9Q0LvLUNwLY5Wku3xgTKWQU0r1TbpkXNvtP91H6hB6GhM4xzvFDibF3V9Zz87nWJpTtpi0Ne7x0Oreg0SLLvMJpKu/wnI05aVdw+jPPrB/uHOyEtHJMykfA/UqObT+4gG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612812257; 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=rTYVBnC8DeTiikg0oxh33vUffvjFeCYrhhCo0rVxKGM=; b=J/MQvYFz6H865Cs4R2C+0L7N71GEe6ZZPZ4XpoZg006eSfC95mah4801AEtTlI/1MLLAm023AjSfRYr5cr5AHcjxmTnWj53oW8bQIYWU+lEfApTOywKmsmvI4he+/YmyL2kJuxXvAd5idwJdXmvzDRTSOoDsJhEXYAJP8OraF9Y= 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 1612812257815116.25835737537307; Mon, 8 Feb 2021 11:24:17 -0800 (PST) Received: from localhost ([::1]:39932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9C8p-0001kB-EE for importer@patchew.org; Mon, 08 Feb 2021 14:24:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95uX-0004Lz-GO for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:03 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95uQ-0000e7-DR for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:44:59 -0500 Received: by mail-wr1-x42e.google.com with SMTP id n6so4105148wrv.8 for ; Mon, 08 Feb 2021 04:44:52 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x15sm11738456wro.66.2021.02.08.04.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:44:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C2DA1FF9F; Mon, 8 Feb 2021 12:38: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=rTYVBnC8DeTiikg0oxh33vUffvjFeCYrhhCo0rVxKGM=; b=Sv6Ff+jIs8UHD8i8kuRbL+Eb6jMiSVZslttZZkAzq+OGwyjFgLLCAiMtSAWRC09/E2 A6Y4XvRREF5lIN+8gA4wAJtm3SxY1GkcsMFpkhgEK2lm5wr5GsUtWSaxwYXXDiDgdyx8 Zn0c30q36HWRmRGEZMf5RRT/NsSpggW5q9V0Vay+D9Vx4tQvFDVxDSnb780ZVjynDODu CplMnAcKUd+yJzzw/xr2oQInELQ2g76J+I91X3pZzC4+a5+1fjoRZ5wsjcK7qEuntb2S HmJX4cPlxFWoDrb0yZ9zZHZ4/zCXkjA/7+peZ7BJFIloJqB5vlVY3BZO9yfc92rGis5W PlJg== 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=rTYVBnC8DeTiikg0oxh33vUffvjFeCYrhhCo0rVxKGM=; b=p557hcgEh48mwqOxVx+H1sRu+aoDsJ5gEhC7q5Ii0h0jwIVTlLc+aM87T+Sfebqngl 2982S9YKmiWAh2bR7wuLkC9+A6lS9uk5qjudi4JMqO/H2ZCCaqupuqXg83oNBFkYO0pT 75GMFqVZums45nBwqvXlzRiMiGYDvsKuMa8zmC7SXmjwiwgRAnqd50blQlL4OS1hSkOa PUBx/1iLvmm1+yQIXFjG1ZrUmpNWv3lQL7hToZ7yUU3pE/NgRgTGJyzzYUZvv4XSuKCp L7FashbRAk006M/dwAbPmgHoggaxAZbSqKUL9j+KQV4eV/sBdI4RhOALSyfEo+g1Zvii QlLQ== X-Gm-Message-State: AOAM532tWZdKuUA88MVHxUmk6NMZizePSPXmxNa5bjdjVhSyiFa+WVes J/nJh2lFC0cBzU/sKet3VSSOGg== X-Google-Smtp-Source: ABdhPJz1lO3o6rYRyM7FSwfSy0nD8uXaWB3Vyh1AapqQ9A1sDBKtPUNM+wW2IONA7IxGi6Z4iRBsWw== X-Received: by 2002:a5d:4c84:: with SMTP id z4mr19246184wrs.289.1612788291490; Mon, 08 Feb 2021 04:44:51 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/16] docs/system: document an example booting the versatilepb machine Date: Mon, 8 Feb 2021 12:38:21 +0000 Message-Id: <20210208123821.19818-17-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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: Anders Roxell , "open list:Versatile PB" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is a bit more out there including Aurelien's excellent write up and older Debian images here: https://www.aurel32.net/info/debian_arm_qemu.php https://people.debian.org/~aurel32/qemu/armel/ However the web is transitory and git is forever so lets add something to the fine manual. Signed-off-by: Alex Benn=C3=A9e Cc: Anders Roxell Cc: Aurelien Jarno Message-Id: <20210202134001.25738-16-alex.bennee@linaro.org> diff --git a/docs/system/arm/versatile.rst b/docs/system/arm/versatile.rst index 51221c30a4..2ae792bac3 100644 --- a/docs/system/arm/versatile.rst +++ b/docs/system/arm/versatile.rst @@ -27,3 +27,37 @@ The Arm Versatile baseboard is emulated with the followi= ng devices: devices. =20 - PL181 MultiMedia Card Interface with SD card. + +Booting a Linux kernel +---------------------- + +Building a current Linux kernel with ``versatile_defconfig`` should be +enough to get something running. Nowadays an out-of-tree build is +recommended (and also useful if you build a lot of different targets). +In the following example $BLD points to the build directory and $SRC +points to the root of the Linux source tree. You can drop $SRC if you +are running from there. + +.. code-block:: bash + + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- = versatile_defconfig + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- + +You may want to enable some additional modules if you want to boot +something from the SCSI interface:: + + CONFIG_PCI=3Dy + CONFIG_PCI_VERSATILE=3Dy + CONFIG_SCSI=3Dy + CONFIG_SCSI_SYM53C8XX_2=3Dy + +You can then boot with a command line like: + +.. code-block:: bash + + $ qemu-system-arm -machine type=3Dversatilepb \ + -serial mon:stdio \ + -drive if=3Dscsi,driver=3Dfile,filename=3Ddebian-buster-armel-rootfs= .ext4 \ + -kernel zImage \ + -dtb versatile-pb.dtb \ + -append "console=3DttyAMA0 ro root=3D/dev/sda" --=20 2.20.1