From nobody Sun May 5 11:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1572889327; cv=none; d=zoho.com; s=zohoarc; b=UZC2HlH1nqaV+qfdVl+EFMO9DIAYd1W0pG6LinDSM101L/9q3ItL4xNBEoA9AtY3soa9IC6qsghvNe5ya37dFRNL9UlpbnRRiwDcOmxZw3JslZM8iM/mf1xLQvhIF5koAq8S4a7khYHk+TiJ3tce3BKpn09HGH8GhKbs7tsqxvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572889327; 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=8wmXszct5JWwuAJbtAvDGMbcxeueyorByVefouToxlk=; b=eDRJLpkUZZ+qM/0tshvzWuGVOab3pUh0Bw6HLwSB7MH9PYY7XLfxZ91gMdPPMwgcIUFfRmsY9VW5JA3RSnbqpkKjpPQdDkjTi1gKlv9kthgNKZy36KpDAEh+DcZKtdTYsHC8iisCIJvh62ibRCqe5ZeQb69u6z4aAIzIvPIUzH4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572889327657803.1291821504501; Mon, 4 Nov 2019 09:42:07 -0800 (PST) Received: from localhost ([::1]:35922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgMg-0003CT-KB for importer@patchew.org; Mon, 04 Nov 2019 12:42:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34555) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgHo-0006HN-Lp for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRgHm-00010t-OB for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:04 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42176) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRgHm-00010A-GO for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:02 -0500 Received: by mail-wr1-x441.google.com with SMTP id a15so18085808wrf.9 for ; Mon, 04 Nov 2019 09:37:02 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z8sm12883011wrp.49.2019.11.04.09.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 09:36:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9BF681FF8C; Mon, 4 Nov 2019 17:36:54 +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=8wmXszct5JWwuAJbtAvDGMbcxeueyorByVefouToxlk=; b=CyUvbujd7+8BwQLmf02DMw7p4IhjUtFCffcdWbgaKdoC3IYXwfUxeV23H3Mrm5brY0 5wiIDn03NG55LpxgWjJhmY4NOKRfrd7IInJfqj39aca6SW168Q7mlCF/dzK7+GOgYsA8 c/NkH0yBuTESTY00RF0EiX8/fWE2ew8qBGB/poVKbKbFWnY9BC7w2EvOmHA3LFDPMmta dtjRMfT/Gx9gd4uOEwd2E2nntwCPzuIA/8ZRTHHqjfjS92PQpWrqPiIA5JAFhxWkQ1QM qSQZ6xktoSoCd7TcUqLbnK7+G9bwqtuV/jnFHVS5l4MEF8JMRHIxx2Chg0vSD0RzyZyS c2ZA== 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=8wmXszct5JWwuAJbtAvDGMbcxeueyorByVefouToxlk=; b=f25cj8hbyJpjw+ItNS+0yIngY95ovpLHnQkLygdHMLFxaqiO0AzWAmHMY/XwGLXnJO QUUKjdndIUx4xN7+CEaMNhqI+0IVaF/rx3sy4ONDgLMe3C0KU4SIdEnn2rrxfmrDiRcO +NFhJkGEKg/rJE/noi2tnA/HxHi/83CJgwXwzNSXY5R1g/SH5+iHcp8lkco+MjSckyUu nfXZv5XUky+iSzZnvfB2ABjMZAFF+A8FhbpWGvE1172CG5ik+XQQNp5qPcLvkSqmbE0d ZjiSNcbFNIJUxj2031YkkHSXbmEFlWwrHDhM/PujPNJys/hm9uXKpubueKC26Zf/1EVK OaOw== X-Gm-Message-State: APjAAAULOf8vxbCXNuctSbCC18lzXWXA+h5PqRGISeIhLeSdSfK75/Mc iT/Lw5D5OnxCp+c70dqQveF+HWoly7M= X-Google-Smtp-Source: APXvYqyk0FeSnWiB8hChrClNZGcXQ4SyDQ760YNS0DASCbE7vu3sESrjrz+wyOEWFcQ0kcVBHmv1LQ== X-Received: by 2002:a5d:4409:: with SMTP id z9mr20112642wrq.22.1572889019979; Mon, 04 Nov 2019 09:36:59 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/6] tests/vm: netbsd autoinstall, using serial console Date: Mon, 4 Nov 2019 17:36:49 +0000 Message-Id: <20191104173654.30125-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104173654.30125-1-alex.bennee@linaro.org> References: <20191104173654.30125-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Eduardo Habkost , stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, Kamil Rytarowski , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Instead of fetching the prebuilt image from patchew download the install iso and prepare the image locally. Install to disk, using the serial console. Create qemu user, configure ssh login. Install packages needed for qemu builds. Signed-off-by: Gerd Hoffmann Reviewed-by: Kamil Rytarowski Tested-by: Thomas Huth [ehabkost: rebased to latest qemu.git master] Signed-off-by: Eduardo Habkost Message-Id: <20191031085306.28888-2-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/netbsd | 189 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 179 insertions(+), 10 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 18aa56ae826..5e04dcd9b16 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -2,10 +2,11 @@ # # NetBSD VM image # -# Copyright 2017 Red Hat Inc. +# Copyright 2017-2019 Red Hat Inc. # # Authors: # Fam Zheng +# Gerd Hoffmann # # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. @@ -13,20 +14,53 @@ =20 import os import sys +import time import subprocess import basevm =20 class NetBSDVM(basevm.BaseVM): name =3D "netbsd" arch =3D "x86_64" + + link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8= .0-amd64.iso" + size =3D "20G" + pkgs =3D [ + # tools + "git-base", + "pkgconf", + "xz", + "python37", + + # gnu tools + "bash", + "gmake", + "gsed", + "flex", "bison", + + # libs: crypto + "gnutls", + + # libs: images + "jpeg", + "png", + + # libs: ui + "SDL2", + "gtk3+", + "libxkbcommon", + ] + BUILD_SCRIPT =3D """ set -e; - rm -rf /var/tmp/qemu-test.* - cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); + rm -rf /home/qemu/qemu-test.* + cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); + mkdir src build; cd src; tar -xf /dev/rld1a; - ./configure --python=3Dpython2.7 {configure_opts}; + cd ../build + ../src/configure --python=3Dpython3.7 --disable-opengl {configure_= opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ + poweroff =3D "/sbin/poweroff" =20 # Workaround for NetBSD + IPv6 + slirp issues. # NetBSD seems to ignore the ICMPv6 Destination Unreachable @@ -36,14 +70,149 @@ class NetBSDVM(basevm.BaseVM): ipv6 =3D False =20 def build_image(self, img): - cimg =3D self._download_with_cache("http://download.patchew.org/ne= tbsd-7.1-amd64.img.xz", - sha256sum=3D'b633d565b0eac3d02015= cd0c81440bd8a7a8df8512615ac1ee05d318be015732') - img_tmp_xz =3D img + ".tmp.xz" + cimg =3D self._download_with_cache(self.link) img_tmp =3D img + ".tmp" - sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) + iso =3D img + ".install.iso" + + self.print_step("Preparing iso and disk image") + subprocess.check_call(["ln", "-f", cimg, iso]) + subprocess.check_call(["qemu-img", "create", "-f", "qcow2", + img_tmp, self.size]) + + self.print_step("Booting installer") + self.boot(img_tmp, extra_args =3D [ + "-bios", "pc-bios/bios-256k.bin", + "-machine", "graphics=3Doff", + "-cdrom", iso + ]) + self.console_init() + self.console_wait("Primary Bootstrap") + + # serial console boot menu output doesn't work for some + # reason, so we have to fly blind ... + for char in list("5consdev com0\n"): + time.sleep(0.2) + self.console_send(char) + self.console_wait("") + self.console_wait_send("> ", "boot\n") + + self.console_wait_send("Terminal type", "xterm\n") + self.console_wait_send("a: Installation messages", "a\n") + self.console_wait_send("b: US-English", "b\n") + self.console_wait_send("a: Install NetBSD", "a\n") + self.console_wait("Shall we continue?") + self.console_wait_send("b: Yes", "b\n") + + self.console_wait_send("a: ld0", "a\n") + self.console_wait_send("a: This is the correct", "a\n") + self.console_wait_send("b: Use the entire disk", "b\n") + self.console_wait("NetBSD bootcode") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("b: Use existing part", "b\n") + self.console_wait_send("x: Partition sizes ok", "x\n") + self.console_wait_send("for your NetBSD disk", "\n") + self.console_wait("Shall we continue?") + self.console_wait_send("b: Yes", "b\n") + + self.console_wait_send("b: Use serial port com0", "b\n") + self.console_wait_send("f: Set serial baud rate", "f\n") + self.console_wait_send("a: 9600", "a\n") + self.console_wait_send("x: Exit", "x\n") + + self.console_wait_send("a: Full installation", "a\n") + self.console_wait_send("a: CD-ROM", "a\n") + + self.print_step("Installation started now, this will take a while") + self.console_wait_send("Hit enter to continue", "\n") + + self.console_wait_send("d: Change root password", "d\n") + self.console_wait_send("a: Yes", "a\n") + self.console_wait("New password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("New password:") + self.console_send("%s\n" % self.ROOT_PASS) + self.console_wait("Retype new password:") + self.console_send("%s\n" % self.ROOT_PASS) + + self.console_wait_send("o: Add a user", "o\n") + self.console_wait("username") + self.console_send("%s\n" % self.GUEST_USER) + self.console_wait("to group wheel") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("a: /bin/sh", "a\n") + self.console_wait("New password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("New password:") + self.console_send("%s\n" % self.GUEST_PASS) + self.console_wait("Retype new password:") + self.console_send("%s\n" % self.GUEST_PASS) + + self.console_wait_send("a: Configure network", "a\n") + self.console_wait_send("a: vioif0", "a\n") + self.console_wait_send("Network media type", "\n") + self.console_wait("autoconfiguration") + self.console_wait_send("a: Yes", "a\n") + self.console_wait_send("DNS domain", "localnet\n") + self.console_wait("Are they OK?") + self.console_wait_send("a: Yes", "a\n") + self.console_wait("installed in /etc") + self.console_wait_send("a: Yes", "a\n") + + self.console_wait_send("e: Enable install", "e\n") + proxy =3D os.environ.get("http_proxy") + if not proxy is None: + self.console_wait_send("f: Proxy", "f\n") + self.console_wait("Proxy") + self.console_send("%s\n" % proxy) + self.console_wait_send("x: Install pkgin", "x\n") + self.console_init(1200) + self.console_wait_send("Hit enter to continue", "\n") + self.console_init() + + self.console_wait_send("g: Enable sshd", "g\n") + self.console_wait_send("x: Finished conf", "x\n") + self.console_wait_send("Hit enter to continue", "\n") + + self.print_step("Installation finished, rebooting") + self.console_wait_send("d: Reboot the computer", "d\n") + + # setup qemu user + prompt =3D "localhost$" + self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_wait_send(prompt, "exit\n") + + # setup root user + prompt =3D "localhost#" + self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_sshd_config(prompt) + + # setup virtio-blk #1 (tarfile) + self.console_wait(prompt) + self.console_send("echo 'chmod 666 /dev/rld1a' >> /etc/rc.local\n") + + # turn off mprotect (conflicts with tcg) + self.console_wait(prompt) + self.console_send("echo security.pax.mprotect.enabled=3D0 >> /etc/= sysctl.conf\n") + + self.print_step("Configuration finished, rebooting") + self.console_wait_send(prompt, "reboot\n") + self.console_wait("login:") + self.wait_ssh() + + self.print_step("Installing packages") + self.ssh_root_check("pkgin update\n") + self.ssh_root_check("pkgin -y install %s\n" % " ".join(self.pkgs)) + + # shutdown + self.ssh_root(self.poweroff) + self.console_wait("entering state S5") + self.wait() + + if os.path.exists(img): + os.remove(img) os.rename(img_tmp, img) + os.remove(iso) + self.print_step("All done") =20 if __name__ =3D=3D "__main__": sys.exit(basevm.main(NetBSDVM)) --=20 2.20.1 From nobody Sun May 5 11:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1572889156; cv=none; d=zoho.com; s=zohoarc; b=NP4ntHAAcYRkIeb+hNHXyyGbNRm+iy1+xRlfYlsQW/NPraoW1hiqfvEVYEA/L+W3/6Xf/Bb12b3pHMkCYbvuXxBcTYS6sMcYoenHNVRZizxXv7L1EiZABBMFJbQXxDKLzgB1rVnRR/cZruyShzSdwrB1oXg6DhUZZY+PzQw/oh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572889156; 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=XcS/d+z9U2mFL1U0Ml1IHJyqP5nrDCHJ2/oKDxLE0wY=; b=CUzAh8//B/sIDrO5P0EBOxU26n5YD0vi36GxYYbffmHZSqfrYRaoM0dCLM6SxRhj3RqQuAgnPQSqy+cW1uwtabirBDISfsCiCWcvNNd61SsBHmJLjPwWiv6AzsAmJptSJKD+TwME51rVwT2KZyMy1RFTGH+6s3SEEbuMOOZg2JI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572889156725605.1971656778713; Mon, 4 Nov 2019 09:39:16 -0800 (PST) Received: from localhost ([::1]:35852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgJr-0007x2-Pf for importer@patchew.org; Mon, 04 Nov 2019 12:39:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34499) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgHj-0006AW-MU for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRgHi-0000zT-NO for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:36:59 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:52595) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRgHi-0000z4-HV for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:36:58 -0500 Received: by mail-wm1-x329.google.com with SMTP id c17so10280451wmk.2 for ; Mon, 04 Nov 2019 09:36:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a15sm18356066wrw.10.2019.11.04.09.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 09:36:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF0C61FF8F; Mon, 4 Nov 2019 17:36:54 +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=XcS/d+z9U2mFL1U0Ml1IHJyqP5nrDCHJ2/oKDxLE0wY=; b=pga89U5NPAe5A22AAkeGSQIWYDYyghmfzvZht4LJ3bJ7KzVzoVUvmnFiwPv+cg3weL UPnESsXXDcY3IhJrrryCIu8qK03bV+n86HRogMoj2yM8s2P1zbYdIfaEIxiPXXT/LpYl 2ZCR9wMTuqI3KUJSW/Gu6MjEtxXXH44fGn/CwbbrCziMXtdx2WQzVNKe4XVWz6OMElRO A96IwOUqdPJ28FCsWYQLe6jYQ2dWvCNbuWrbljGCEtSqGYRIU1iSFF9n7nS0oHh+mFtj 10Cvu6c8/CIeQhFDzWb1cT1ceFfyK7zxUdwBFdax0R3xLyny02bEulY9ZYCI7twgyUHU T6pg== 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=XcS/d+z9U2mFL1U0Ml1IHJyqP5nrDCHJ2/oKDxLE0wY=; b=P6nP3foYHUy/gihTlWuOHhkNLkEbhYeS9v9azjPGlQEAIzw80Xax3e5NwtZIbgB4Ab 7m/W7DYhysa7dco2p0icKMF8I62Ve4CFmBrasUYdBln1gCeTRysP7UpDI6uOWSDHygBo OQwQQHIYo6f+8Qy1g5i9Kk3Xc7Ze5oZTQu75tYgRQPWbCfT0XmclyYXTkjOatfR9IOt/ C3ddHXsPVfGd6ktdJkKV0e0bk+9BI8P7ceswpi+UCP44sfhsNv3Pu2IO8Vd9eIMy5LEi 6knWjGtyLHM8RswRzgFl1GbvLxGEr4J+ImPGZOCDUyyL0PaQtiGODOfpPaUPPmMkwckI P0HQ== X-Gm-Message-State: APjAAAVrfDvAw/sXaD19QerdE5Z7RSziDmLszTWIUyq0VdL4LARRoxyH HMRirQPgpHTjFpKJCDGWB3nrAskirRQ= X-Google-Smtp-Source: APXvYqyv1U5NjmZUgAs1Ym/rvcLDS5HxP/o8SxaHQdYCr7w1RwTir+/5r6TWKKiYE2Jqf6+bYpbt0g== X-Received: by 2002:a7b:c04c:: with SMTP id u12mr219802wmc.134.1572889017366; Mon, 04 Nov 2019 09:36:57 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/6] tests/vm: add console_consume helper Date: Mon, 4 Nov 2019 17:36:50 +0000 Message-Id: <20191104173654.30125-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104173654.30125-1-alex.bennee@linaro.org> References: <20191104173654.30125-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Helper function to read all console output. Signed-off-by: Gerd Hoffmann Message-Id: <20191031085306.28888-3-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 2929de23aa7..086bfb2c66d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -242,6 +242,25 @@ class BaseVM(object): return False return True =20 + def console_consume(self): + vm =3D self._guest + output =3D "" + vm.console_socket.setblocking(0) + while True: + try: + chars =3D vm.console_socket.recv(1) + except: + break + output +=3D chars.decode("latin1") + if "\r" in output or "\n" in output: + lines =3D re.split("[\r\n]", output) + output =3D lines.pop() + if self.debug: + self.console_log("\n".join(lines)) + if self.debug: + self.console_log(output) + vm.console_socket.setblocking(1) + def console_send(self, command): vm =3D self._guest if self.debug: --=20 2.20.1 From nobody Sun May 5 11:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1572889161; cv=none; d=zoho.com; s=zohoarc; b=MKkH3mG4ot0G4dXaU/2XYhGKPV6/fqI1aHuN29em3XGy22IMy2LOWqLdUQba+HMxgVUIxXy5COb85CICgCkn7PuNMiQkGhbPogFTk71EbcWLv2PHm0P32xbc6h9pfBrRY6HxF8KagPiQz/jjZrJw6uoEFou9GDGhd2AW/EBUPNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572889161; 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=0T0SS4x7TjpY+2zkzV95ywVD8nqA26iLH449n9iQx28=; b=JuomN0ngazz4/49apLxgDmsKBJ0i0D4yjhsnjXWNbopFiwNCpCMW1ISDJm2v4tt68ymR1d01JKH05cwxrBe8vvUMfRkf0GR1c9coQTpeJfPHSoQwQkT+yX+FkMNP8LkSB9BXAqMn82V4qjLf9XFcIOCs/VVOm7hw4NkEk0dPeBY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572889161561675.7611414718637; Mon, 4 Nov 2019 09:39:21 -0800 (PST) Received: from localhost ([::1]:35856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgJu-00081A-Qa for importer@patchew.org; Mon, 04 Nov 2019 12:39:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34539) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgHn-0006Fl-RF for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRgHm-000110-Pk for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:03 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRgHm-00010R-Jk for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:02 -0500 Received: by mail-wm1-x342.google.com with SMTP id q130so16968423wme.2 for ; Mon, 04 Nov 2019 09:37:02 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c15sm15499745wmb.45.2019.11.04.09.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 09:36:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3C081FF90; Mon, 4 Nov 2019 17:36:54 +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=0T0SS4x7TjpY+2zkzV95ywVD8nqA26iLH449n9iQx28=; b=cIClDeFR75PK/+AB2MCb1zOJVLm/SGAtlZFOUuWLI5U3R1HneSBK2IvMLVpCQM7fg+ bquwLJifdkGmYkCDyRjy8X2eHGUuHf1ZPvi+Tihc4ANxXFQHxfSrd8+e1U3KK853j7Kj vRSL+dU3Vbi4bpRZE8ysE7whwjLSUSgJ1QfkiiJIT7+2o3UUVrhm5kW1MXE/NL9c4utM fxHaTfswV+gzurTD7JzNfpMxTCk2vwBcC4cPVk0AUIOJhFk79Kq+AbGezgLkoWFJ4Rda N8BN8STKuMmZ7JoigruWl5MoTy8O9lc/rDDNstQ0pLxhpyS7XwNbNvw0/YzPn6RgB1Yl ckDQ== 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=0T0SS4x7TjpY+2zkzV95ywVD8nqA26iLH449n9iQx28=; b=QsH/ZnMOmsXx5N6QJ7nB6DNAAa9NmZup1+LYmv3845o7zzHcBPAgXPh0ZTVxpi6aM9 PA45sWj9Ra3tzvYiR64Yy8yuWwkNbsWRctJR0DkVdMoBsz9jylkYFCDUkSuK95pbsn8K kHX9KqhiJF6M5OZME+BLs7yIRK6E97/6bRhL3qN9nnABNuChMpmTxAb0aaRmp76cQjbN o+DosvwMYKDUStJ+JsVzHoG7dcpXPKUMP71wwtlyyITLctY+kXko9tsGFwJYsoPGAZZ5 IgpYhZdRz1nTdZihK/ElF0LjZYG/NOdxeyksOMi0h9wniR8XqIpDhUwQQMylfTqJajzQ UNaw== X-Gm-Message-State: APjAAAXp7BCYZvafcfkgLyR3GD/iT7cIcTU3H8TIbzbIkn2i3qAw5tuR pIcSCJwx7UJFLHxirgU6OrgWZQ== X-Google-Smtp-Source: APXvYqyIJtzxzoXZGi2oae3QBDAXm+Pa3NOMHaz94hp6c5grdv92vsSOCbGbz54kdVQ6ltKLUsou3w== X-Received: by 2002:a1c:750e:: with SMTP id o14mr209902wmc.35.1572889021299; Mon, 04 Nov 2019 09:37:01 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/6] tests/vm: use console_consume for netbsd Date: Mon, 4 Nov 2019 17:36:51 +0000 Message-Id: <20191104173654.30125-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104173654.30125-1-alex.bennee@linaro.org> References: <20191104173654.30125-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Use new helper to read all pending console output, not just a single char. Unblocks installer boot. Signed-off-by: Gerd Hoffmann Message-Id: <20191031085306.28888-4-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/netbsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 5e04dcd9b16..d1bccccfd01 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -93,7 +93,7 @@ class NetBSDVM(basevm.BaseVM): for char in list("5consdev com0\n"): time.sleep(0.2) self.console_send(char) - self.console_wait("") + self.console_consume() self.console_wait_send("> ", "boot\n") =20 self.console_wait_send("Terminal type", "xterm\n") --=20 2.20.1 From nobody Sun May 5 11:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1572889247; cv=none; d=zoho.com; s=zohoarc; b=B/RPzzDezhyjRDrl8LnMLxuLxEPhy1+M2utcwbUqX1VU3tWOiAz7f4Qgo+CuPI/rgDSFxwlmdYPAdHBqcYUEUb7pYrV224WHis2A2YZSc2v2f6qIUCRUGO6XswGoMMs9GBkJlWaaDLTD8lgLkVLtQySG1MGwtW+ucLs1BS+Z5GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572889247; 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=FjjmRzG7VpaTW0V21y7CdXVm7zUUzOnKit95Yf46DtY=; b=PZB5cMkRzbR+dmWEq++duHebTzy7z9qjTKKzWpE71Cwlc04OR93l8F7AyFxVq4Ii7lbWAAsQQkOb7OWh+RftXIpqOS+tB/8EYtCtk25O0nVl0I8Auysw2czKHkIubX1QGD0mguujT0r2zLFkGET1TaYVwWlmt1ARt+23TtWa4Fs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572889247214858.0652607271993; Mon, 4 Nov 2019 09:40:47 -0800 (PST) Received: from localhost ([::1]:35902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgLO-0001wN-8b for importer@patchew.org; Mon, 04 Nov 2019 12:40:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34520) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgHm-0006Cy-6x for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRgHk-0000zu-2t for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:02 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:47007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRgHj-0000zb-T5 for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:00 -0500 Received: by mail-wr1-x42d.google.com with SMTP id b3so12334054wrs.13 for ; Mon, 04 Nov 2019 09:36:59 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v8sm19851770wra.79.2019.11.04.09.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 09:36:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 13FAA1FF91; Mon, 4 Nov 2019 17:36:55 +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=FjjmRzG7VpaTW0V21y7CdXVm7zUUzOnKit95Yf46DtY=; b=FDFRqqxasCjbmaqIwl/IhJhKJWFYBlJm/+7Yl83Cj6E77D7BVIl/wzr1NPoLVpnndt 8c6luyAi3l+Jb+XV6pCbfyIkIF+C8R2EP8T+CdGFThTlR/mc48e5Qy9oqsPZY2YopZ3A qhqN4ILhqMbHz5t7s9pFxrQChM2FrvzrszROWLFQhD8NqQQiZNMAS0/4sn1k5mK2o2ip PU8XJRH7+hS53AyhsaBXb8H7xb9Rrzsn0QJK/Neag5aj6URY3yUSeDYDSba6vu/jDkvM FYj3eUVfVW1Mh6w8Q8/8DCwdXHkAILgB/bYPiGTYaCtMGSxcvT+Tz8bxdS4HlnM3P8+O KyPw== 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=FjjmRzG7VpaTW0V21y7CdXVm7zUUzOnKit95Yf46DtY=; b=Ijxdnu+MXk0MXPY6vmImCtBaFQoeKF0kYa9pGQ7BdZavMTSM/42aaUJ950xzjEE6mR oZDSnEhJYchK/JQ8QmlSFPQcDMLWiG2o/laINhFvOBUzK0v2or/+OUPidD6/yen45/KH UwH+MDXs/Eoiye3RP6C+gMdG9E0/M0SI/V2WuPqLanD8FYyyYs8vdODOVywe+l1GyXGc gEq1/CHwybtmVCqYWOmXJdkQB+lWaYoNg3i/BfwVgRihSnd9NzqJZnyt5qYpkUfYJuQx bstFyXFf7yw1AHzOF4n0BLU3AL0KW72r45ubEQ4/pXFWtXSW1eXra4N03QjgrOpTzMwV KiJg== X-Gm-Message-State: APjAAAVzDuJf0puSLcievWzXIkaNzB5XI/VU07UIwgsWtHgoghNCYr5H Ka4/wum6nb5ZNHaUw/Wvx2C1Lw== X-Google-Smtp-Source: APXvYqzJGT0WkVRCl/ITdxWAhQ7MZ+84D2rWS/MgiFzveLGDVTsWzofRgiESwOPYlqR5d5jd2cFqSw== X-Received: by 2002:a5d:4748:: with SMTP id o8mr25239734wrs.239.1572889018722; Mon, 04 Nov 2019 09:36:58 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/6] tests/vm: update netbsd to version 8.1 Date: Mon, 4 Nov 2019 17:36:52 +0000 Message-Id: <20191104173654.30125-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104173654.30125-1-alex.bennee@linaro.org> References: <20191104173654.30125-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Message-Id: <20191031085306.28888-5-kraxel@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/netbsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index d1bccccfd01..33779402dd1 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -22,7 +22,7 @@ class NetBSDVM(basevm.BaseVM): name =3D "netbsd" arch =3D "x86_64" =20 - link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8= .0-amd64.iso" + link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8= .1-amd64.iso" size =3D "20G" pkgs =3D [ # tools --=20 2.20.1 From nobody Sun May 5 11:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1572889167; cv=none; d=zoho.com; s=zohoarc; b=mG9ujSDXyiKQwhKSLJn3cto1ELWCmrK4q+2F7wpasdBLpf0+o1Ix+WDgblaFTefSLle1VS3B4/SdWgj8ZyF6vrYE581PdetdLWc0FdIqI52idEOKIHjkFzvVfPbR2KGPbm3PgNoLfRYdIh1oC5BCn1ktmKNHZoy2KqB5aHekyDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572889167; 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=sEHnGi1dpcWkzmcNmi3sg94gf4w8+sRwyHjEqhhS/R4=; b=bGOtxBdJ2Q/oFwbobsCzn2SktqK8loxrQORF7RwLKw3MTbl7lVsSFCajjWkTFFbccQ4NzUl+HXTMkQX2N0cMCWLzgknTfUp9FJR3+WzGeoojVbl2+PdZU5skyre0ioZp3FfD+P3t8h5k247+yKLwDAaJ2BzqxTtvp5H2asuwWSQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1572889167575820.880204222796; Mon, 4 Nov 2019 09:39:27 -0800 (PST) Received: from localhost ([::1]:35862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgK6-0008KS-7J for importer@patchew.org; Mon, 04 Nov 2019 12:39:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34612) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgHv-0006S2-Fc for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRgHo-00011e-0I for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:11 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRgHn-00011H-Qu for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:03 -0500 Received: by mail-wm1-x341.google.com with SMTP id q70so17627353wme.1 for ; Mon, 04 Nov 2019 09:37:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l4sm31953123wrf.46.2019.11.04.09.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 09:37:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 35B781FF92; Mon, 4 Nov 2019 17:36:55 +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=sEHnGi1dpcWkzmcNmi3sg94gf4w8+sRwyHjEqhhS/R4=; b=lku22ZuQNs40GznxyzwPrTGZBDLwcQA1GAQb7Y9qMKTkX9G2tLRUjWNg34owoh+P3o aE+51fHCfpbRX1/AlH4hiB/+OmSnEv9EafqOa1GTrQ06fNoPQMv5pivxydsCXXzTIvX2 gHC5z187YWFqvbODxRryAW+Fr4xvuxmkSG7RNexbAUZASKZnt5uzGiI6Ou4y6u7jS7dA 5nXm1E1at4TjJQyxNfWz7Wo7gzc0+fTNaWOKP66Y0ZH3S1RopGtRmTETMYfEL5OSYCsm /blXaZV6pqtR4VigeEKfpRQj9w+KixuqL6Dth1mtxHaH2hvLlC8PxyXi2l6ucVqCnaiE NEWw== 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=sEHnGi1dpcWkzmcNmi3sg94gf4w8+sRwyHjEqhhS/R4=; b=BwiAZQX3tKZyMyk1hYQGZIIgrr7McF1NbhVCY05xJWrxZHWGxUugfvuleLkbAWzb/s 7H2mzI3+P6+PsstjGuwd5J4/wHWzRXVJbY3Lr/f2bowSgDua+WFzMyeLW8P04s6AObfi AlVvIwHy/Hl9/HO+O0G8rf3XGVmKA5IxqohfZYH3rawLCQamt7FvwTiOj5RsJH3PyUO6 XJrWXGyCYzgxAnhZWQPt8Wkkx+bvaswqcLvMxs2kgwiiSj3J8ZACHNuo26RVAv5OJQi7 nsK8weDriUsNbzTUW2+Sa0gkfaVb/1pzhtNV9vSbL+yHUlhT6U0ZjUJF1oT2jX8VwB10 LMdw== X-Gm-Message-State: APjAAAUy7pnWPYegzMOep5BV3bDmCeUSpwYVXD1N9ik9kPh+pDZbRnnx FNdVAHUE06+Jh2MCF+Zp4uQDZg== X-Google-Smtp-Source: APXvYqwcszFd93sizY0JiCtQv58ZshV933K7g3rWe6CK0nd7CSw/4xLm90Ac5DhBgmSDnFu5rsOD/w== X-Received: by 2002:a1c:5fc4:: with SMTP id t187mr245276wmb.142.1572889022681; Mon, 04 Nov 2019 09:37:02 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/6] tests: only run ipmi-bt-test if CONFIG_LINUX Date: Mon, 4 Nov 2019 17:36:53 +0000 Message-Id: <20191104173654.30125-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104173654.30125-1-alex.bennee@linaro.org> References: <20191104173654.30125-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Corey Minyard , berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Kamil Rytarowski , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This test has been unstable on NetBSD for awhile. It seems the mechanism used to listen to a random port is a Linux-ism (although a received wisdom Linux-ism rather than a well documented one). As working around would add more hard to test complexity to the test I've gone for the easier option of making it CONFIG_LINUX only. Signed-off-by: Alex Benn=C3=A9e Cc: Corey Minyard Cc: Kamil Rytarowski --- tests/Makefile.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index 534ee487436..8566f5f119d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -177,7 +177,9 @@ check-qtest-i386-$(CONFIG_SGA) +=3D tests/boot-serial-t= est$(EXESUF) check-qtest-i386-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) check-qtest-i386-y +=3D tests/rtc-test$(EXESUF) check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D tests/ipmi-kcs-test$(EXESUF) +ifdef CONFIG_LINUX check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D tests/ipmi-bt-test$(EXESUF) +endif check-qtest-i386-y +=3D tests/i440fx-test$(EXESUF) check-qtest-i386-y +=3D tests/fw_cfg-test$(EXESUF) check-qtest-i386-y +=3D tests/device-plug-test$(EXESUF) --=20 2.20.1 From nobody Sun May 5 11:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1572889424; cv=none; d=zoho.com; s=zohoarc; b=ea86xEyZ2ThMeEQxxaga76PRpWHy3Q+BW6wpfqJ5vrPkm0vGbEEpsk76a960bdjYnyTY8eEy5vSukYJzJ0tPs7HHHYXIOoGXM/+fxTUo9LhOUidqmz/ikQNb6BSHGBZJlmD5tAM+CS4/9iJ5/j0PVhT208q0bb4gLfqD1bxn2GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572889424; 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=UKELr7H/B5Ts3z9XAEXzo8WE46skVmRep8vckbpovok=; b=dw1fcwyVlDVdHvxZpE3Q1PYy4OmCw4yDOmxLKdTUXiA1Fw/eLc77TMbYXjSI6YDoFRRyfgV7dlb9LWDprp0TDVSVVW5qmJaHEPjs41vE0OwkADg4uUCCZmW37+ylL5twx+VB/CRwzq/68jILzeG9KFvHQAvvzcuzQe85NpQ56bs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 15728894245441001.0945151892812; Mon, 4 Nov 2019 09:43:44 -0800 (PST) Received: from localhost ([::1]:35938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgOF-0004gH-HO for importer@patchew.org; Mon, 04 Nov 2019 12:43:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRgHq-0006KF-Ej for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRgHp-00012I-2u for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:06 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRgHo-00011o-T9 for qemu-devel@nongnu.org; Mon, 04 Nov 2019 12:37:05 -0500 Received: by mail-wr1-x443.google.com with SMTP id o28so18086287wro.7 for ; Mon, 04 Nov 2019 09:37:04 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q11sm15765727wmq.21.2019.11.04.09.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 09:37:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5FC921FF93; Mon, 4 Nov 2019 17:36:55 +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=UKELr7H/B5Ts3z9XAEXzo8WE46skVmRep8vckbpovok=; b=uowx1xlXe13ntJqjBhgMeym7vDOhndHAvgnz+R+J8c1cu53Liy88Gvl215WNcZiYHY /ujvdwh1xV4gO8qQTW3i4uqCHyKtcNUihL9lL36XyLnU9IA3b8ws5losEjmhpBMsZI8Y gdVcg0oP3o8/WhvLDeBXuyblIX2VTLYOFI4ZYXVcP1u2+iNoC9cFn7hEmkSRKAZUzciM k/CcfsI+1RBnwyWGwl0x/4TYbPQix3shqVYJdC0dNDh2timISyJ6VrgpycfP3qMpAiaf HJK3ketZTBPSjwpYAdSsV7fglxNj2mRIU7UCWxNLCCk90NaJ0EHUCOm43XyKChyq/ghR NnQQ== 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=UKELr7H/B5Ts3z9XAEXzo8WE46skVmRep8vckbpovok=; b=DmuPUQA7KkMrCc/gQWh13PS1A8ISnuqtOWQyo0/eoX0yNvqocjZVW/xeD/PokK4lEK IRYp0svXeUnLvsE3g50oGL1smuqjb69Qz4pcmPg3fwIFsAVcb5GnE9aSp0b25yNYjGwt 6wfuMPAXH6+P7MFGHTy4h7vq9dnYQOE7JJe0p3Pl95/Q9AbTi8T1bpqeglDgsrK2bv+4 gM5iKWUZhhJTvZaw7/GkQHzI1hw1TqcU9bExJDPxeS0cpxfe5qAPrcZRuT5MCAYkbSjp dYsK2iwBXLwc7QA86nEthmg1sJfXbgoCWtyhI9cWE2qYyIRra6ftkCFIZNgN5+JZKJE6 sOKA== X-Gm-Message-State: APjAAAUc3WvlpPGVOelYLTb5z+K9ts1FducZjrz7eSVI0YYsFEa7ao4p b0MXa97iUz+xjnZtssOSoJa/Xg== X-Google-Smtp-Source: APXvYqxr1B12CCr5U9KpM96Cil7RLJjAnM5arpa8h2pucicmdy+LkDScWIX7HVclR3OUWnIq3gIvlw== X-Received: by 2002:adf:dc81:: with SMTP id r1mr22452624wrj.84.1572889023801; Mon, 04 Nov 2019 09:37:03 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 6/6] tests/vm: support sites with sha512 checksums Date: Mon, 4 Nov 2019 17:36:54 +0000 Message-Id: <20191104173654.30125-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104173654.30125-1-alex.bennee@linaro.org> References: <20191104173654.30125-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The NetBSD project uses SHA512 for its checksums so lets support that in the download helper. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 10 ++++++++-- tests/vm/netbsd | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 086bfb2c66d..91a9226026d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -95,19 +95,25 @@ class BaseVM(object): logging.info("KVM not available, not using -enable-kvm") self._data_args =3D [] =20 - def _download_with_cache(self, url, sha256sum=3DNone): + def _download_with_cache(self, url, sha256sum=3DNone, sha512sum=3DNone= ): def check_sha256sum(fname): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] return sha256sum =3D=3D checksum.decode("utf-8") =20 + def check_sha512sum(fname): + if not sha512sum: + return True + checksum =3D subprocess.check_output(["sha512sum", fname]).spl= it()[0] + return sha512sum =3D=3D checksum.decode("utf-8") + cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode("utf-8")).hexdigest()) - if os.path.exists(fname) and check_sha256sum(fname): + if os.path.exists(fname) and check_sha256sum(fname) and check_sha5= 12sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) subprocess.check_call(["wget", "-c", url, "-O", fname + ".download= "], diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 33779402dd1..89390e99fdd 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,6 +23,7 @@ class NetBSDVM(basevm.BaseVM): arch =3D "x86_64" =20 link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8= .1-amd64.iso" + csum =3D "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd636878= 98c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f" size =3D "20G" pkgs =3D [ # tools @@ -70,7 +71,7 @@ class NetBSDVM(basevm.BaseVM): ipv6 =3D False =20 def build_image(self, img): - cimg =3D self._download_with_cache(self.link) + cimg =3D self._download_with_cache(self.link, sha512sum=3Dself.csu= m) img_tmp =3D img + ".tmp" iso =3D img + ".install.iso" =20 --=20 2.20.1