From patchwork Mon Mar 2 18:18:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184105 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2702879ile; Mon, 2 Mar 2020 10:21:04 -0800 (PST) X-Google-Smtp-Source: ADFU+vtoyGXqQ1jgsuTiUT9nVn0Ot/lqVma/q0ee5Z4Cshac4F+AzYe12hdUKCsxZYxL4ColEUo+ X-Received: by 2002:ac8:7158:: with SMTP id h24mr935262qtp.63.1583173264098; Mon, 02 Mar 2020 10:21:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173264; cv=none; d=google.com; s=arc-20160816; b=uHDLLS2wshCTPplI0pdEZOhgfGRIjla3rciBkBVhUhurCuruq9bYPWeJN69IWOyR+D o0SbD27kpZkeYjKJYHr5XZ0p8pQeXSztmwN02I0IoTcRHU0pii6AA4AojdtdZHibTkUk aq4vBOAC23iKJjnygjsAQ1Vsek4MTYQp+40Ui64TVl4ABGBLQ5wVsyDHgEKIFaDcMbVO 3D4eunDHPFQTlwLnLVwum36YP1MM2TfurAo7cVmG+wRBh3g0+7XUE4tMwlxPTxuFRfuc Bt2YN6dT+1eS0WV0jGyMu/D8AvWEX/lNC3juZPKfn+Fb2Xd8k3FSXJFuIfzgUQ72Utzn LQIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ypGQ7p6JhBF1xniDHKxYj04bd6tWT9PMX3hkKC2YjOA=; b=i8Oub8eeapLFfKzRhyUYHL/E3quOLIwcRScZx2wl5DfCJf1G0iT3J3+gTs+ubLFNs2 BMjGo5uTX+x+Hmbk+8ZjMtRz+FP0C07BaslqmFLSZQ1eXRHOyUzysni4sFWNqx93RrtB 38D4xIWl62pMNpE8kRZtUxTYR8n8hfA4PbjVqS0CRFILyveeXxlO+6ZLWECm1zX073mT MmA7ZXGeLEfP/CNFp0tyjcY8A/RYTRg8Zn439XO1wD25IVaZ07S49kGK4YSyINz45bRp qkqAi0k7bgPd2Y7hX3TCFCqAu81C6TYSyyEnYgQO2HuV9nboIpF4S5FwpYOSaicTxW4z NZEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HyTDue8F; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 9si6474338qtt.326.2020.03.02.10.21.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:21:04 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HyTDue8F; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pgd-0005oM-KV for patch@linaro.org; Mon, 02 Mar 2020 13:21:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43484) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pep-0002Qf-W3 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pep-00017Y-1k for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:11 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8peo-00016l-Ra for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:10 -0500 Received: by mail-wr1-x443.google.com with SMTP id j16so1008289wrt.3 for ; Mon, 02 Mar 2020 10:19:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ypGQ7p6JhBF1xniDHKxYj04bd6tWT9PMX3hkKC2YjOA=; b=HyTDue8Fh0MTVFLh3fmkpnayOWqYSG/5iYgbPC48G1HzoVh4a73ZHCo/xFpOaIs5WM TaWpuFTWgY1GWJiP6HdX8igNvKdlI5198zMe4qXp8MtkYQH8fiDtcTrfP5Y6tj7B2fr9 pCCRAlZQsSzBmPQjGwdhKVHZzZEJNnMOhPNCWiz87aMaqujbqmZdF1ekjoA6NNZwWR4G ZNQeJHlHyF+xt24uXMCdlHisst3ssU5kFgDLeTCDtzYDhcYbINlddmW34GiWo1SONvXx k8BWy8qgWaHJna6tg9ql5TKT+KhbyBiuMKEljQlCWZckVd1KTiB+7cuDSsS+PtNT+NUk WLgQ== 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=ypGQ7p6JhBF1xniDHKxYj04bd6tWT9PMX3hkKC2YjOA=; b=i3nDzW2MsES8njuc+8IKVG7HXKeuLSQRBs7/fZmPPywsbpVIY9iAjmVI2L2O5fNd9h FdAvPsGM6lc5ikwxd75uUmBVM5+ER82lDpDXHS2Eg5vvwXkvrojK6B8xXDw43sTo/lOI e441Ppya9DyzVoBg3vIsys0ujqEV/DJ57/t9B7SyAdpxw3VZIYlmsxwWp1oMDWfKwLDK g1JKgNMMsPbOGzP6gdbwlDrO4W9+eAaXQSjCSTDjbzkYWitRW2c278U94FY8UsoMs7CK kkLE3/aTzdoyDiPrt+AX+d8TZXgXPK0Xd53dHeuxbAP4V1+HbWKpWCSS+TVZtMQzQkFA +xyQ== X-Gm-Message-State: ANhLgQ3fmHTG33uMYqH6mPWW0Gm6q5gh9Dlj+S7kR7L7AMWNhD4LciIU FXGcG2Dmj2v1tCM3qNnZKUL2FA== X-Received: by 2002:a5d:4fce:: with SMTP id h14mr798919wrw.177.1583173149793; Mon, 02 Mar 2020 10:19:09 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f195sm314306wmf.17.2020.03.02.10.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:08 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 92B7A1FF8C; Mon, 2 Mar 2020 18:19:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/10] tests/vm: use $(PYTHON) consistently Date: Mon, 2 Mar 2020 18:18:58 +0000 Message-Id: <20200302181907.32110-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 Zheng , Peter Puhov , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Foley , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Change Makefile.include to use $(PYTHON) so for vm-boot-ssh to be consistent with other cases like vm-build. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Peter Puhov Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-2-robert.foley@linaro.org> --- tests/vm/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 9e7c46a4735..778e5067554 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -80,7 +80,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ - $(SRC_PATH)/tests/vm/$* \ + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ $(if $(J),--jobs $(J)) \ --image "$<" \ --interactive \ From patchwork Mon Mar 2 18:18:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184108 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2704168ile; Mon, 2 Mar 2020 10:22:38 -0800 (PST) X-Google-Smtp-Source: ADFU+vuC+q1HFKbzp+pr3siM91Ko342JYzheAqqIl5lkc3aTvB4L139NwUeq+ODFX90tyKqIwDAZ X-Received: by 2002:ac8:7217:: with SMTP id a23mr948515qtp.241.1583173358436; Mon, 02 Mar 2020 10:22:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173358; cv=none; d=google.com; s=arc-20160816; b=XD9T9/iFYaqDhwGw/2M07zQ5QPkmqoyLRKwf74OzOgMAPhgti3raiJVDuqCvjbO1su 2B6YdA+D0blCc8JU3y0zLdtktFCKnPeZn9N+8JQOq6bLJ3bV5hiGOfs3jFZZQa56NQna Flfr1yXT7I1P/ZHhsOKZrdr/FVpHgIzFTau8YdsxTgLaV9y63ep0urtVNKbboKqvqkqt S7OQToY7Fn1pwn37Ps20+8Vimoa1pODyCB8/G8ZN6L7YBmV3yEQkaBjX0pl6ICuLzFWO r/cm0qPVSnN9Mt+ZYaodj8KL03gkKZe7pLOAulDkgg9yW4A+Y3fMDogCJRM6GqZzCxI7 pD6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=zdbZ47hNzKLw0EPtQH9zB6TA7y2oR0qju7k+HVi8YmE=; b=uFmHVyeQLbkljNjSiy3cc+gOmMRPYQ6vhs2ICOAO4W1eUl0LVMZ6RLrnPqoBtr0m1X E2A1TqoSW3pIioG0pv9tbfofJSfHR1mon8a6qaBo3P1bFQfkVBi0h4fhR75cSIJea4x0 E2cYSVlTO3CMfK4HZRBPH1/CwpH85eNoVcHNOpM1jk28mi0HFLLnUYlf9XR7Pq8d2a5M xP+BUzIsddJqc2xi6JHk9lhKVyMZjp7O74cU8uEKBUhMSY5ZJH0ivhG546vRNIdcoQIx 3jqawe7nwUTBRN/XuXlqiW5YCHmHyVgE43p+REnY4/hTsLytL+wv7pHmf2QQZFTenPBU FpHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HTS2En3B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w13si6043267qtt.376.2020.03.02.10.22.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:22:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HTS2En3B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pi9-0000em-V9 for patch@linaro.org; Mon, 02 Mar 2020 13:22:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43508) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pf6-0002Ru-7H for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8peq-00019L-5S for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:18 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:38705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pep-000186-VN for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:12 -0500 Received: by mail-wr1-x441.google.com with SMTP id t11so983751wrw.5 for ; Mon, 02 Mar 2020 10:19:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zdbZ47hNzKLw0EPtQH9zB6TA7y2oR0qju7k+HVi8YmE=; b=HTS2En3BClaOjl0qyUX3FzTmiJv1twnlQsSQoYet53CbFej6ANeF7DSWwye9fA++68 vhnRylg89DiKI1WPvud+9sJfsGnRI/Hol38r/Wm83XSiZxUZmowl2ZnLobPGKnUMpHi9 RvunD5f/0ipK0okOLXxh+NV2arnPmgWTLTd4pdP0DiW40JdEINtCycObNECXUZF1UdxM y2Z5SvQUvyOqw/e8AI5n0LldcBW3Ue7/bBR72ld+JhSGeh4AgBWa0zsMXfWHOx9igBvX WBcLlEZcJCKYUznVrV8DkTSDKNwOVXZnwjc9RGmlPfq4BhN0jyu7cAMBPXsxWZDSbZZn vqIw== 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=zdbZ47hNzKLw0EPtQH9zB6TA7y2oR0qju7k+HVi8YmE=; b=VT+CyDak9i9zHVYxjkMchPjA9bGNB9S/r49eDlG4dOwK8dTafxEAVON3vwgaOppvKt DSBpvt+cnBSbzV00C31/22lJ3EFuQ5KzNoLIy+ryqtTBeEE1PkGYWiGO1on4HEDtzxtd z6RAY0nBvS0kEkUeY1m/a4DgLQe7mGch8dkB7em/4KEAniiOvV2Fl6gixNxlFr63aLQp paYsjIi2i1jjm/ur9tmbnndAFCSCAhnchrLZuKiH0jpSfqxZfOMdQM1DXNrYk4VF3/nl XSKwedmD+Gb7eL5URS8A9StzqU8eflqV/StVQxcUXj0XpQCdKnuBkk5s5FaYkIAkU1qA +eVg== X-Gm-Message-State: ANhLgQ1gRxTQI+rVbKncjzGId7H7R4z53NS8ifmc1Bf8MbGsEU6zRL/7 M+xe/bismJbwgOBqK3LO24gP3Q== X-Received: by 2002:a5d:4ec2:: with SMTP id s2mr726068wrv.291.1583173150931; Mon, 02 Mar 2020 10:19:10 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a70sm298858wme.28.2020.03.02.10.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:09 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A8FAB1FF8F; Mon, 2 Mar 2020 18:19:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/10] tests/vm: Debug mode shows ssh output. Date: Mon, 2 Mar 2020 18:18:59 +0000 Message-Id: <20200302181907.32110-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 Zheng , Peter Puhov , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Foley , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Add changes to tests/vm/basevm.py so that during debug mode we show ssh output. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-3-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4dee6647e6e..c99725b8c0d 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -120,11 +120,16 @@ class BaseVM(object): return fname def _ssh_do(self, user, cmd, check): - ssh_cmd = ["ssh", "-q", "-t", + ssh_cmd = ["ssh", + "-t", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=" + os.devnull, "-o", "ConnectTimeout=1", "-p", self.ssh_port, "-i", self._ssh_key_file] + # If not in debug mode, set ssh to quiet mode to + # avoid printing the results of commands. + if not self.debug: + ssh_cmd.append("-q") for var in self.envvars: ssh_cmd += ['-o', "SendEnv=%s" % var ] assert not isinstance(cmd, str) From patchwork Mon Mar 2 18:19:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184111 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2704496ile; Mon, 2 Mar 2020 10:22:57 -0800 (PST) X-Google-Smtp-Source: ADFU+vsCsQNvcEs5aU17GX51qoqcnL13AzE7GP4Hx8OO/WdnC+UTwG306mQfXqagcFBxzQ8IkDak X-Received: by 2002:a37:7c47:: with SMTP id x68mr577014qkc.8.1583173377205; Mon, 02 Mar 2020 10:22:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173377; cv=none; d=google.com; s=arc-20160816; b=o4npbAdLl7RVFx8JUNe/FfoEa8fLkrgn7R+3s1HLPj52c0mIPJnnctqYSi0jd1HXc7 4UWX1Hj+Rjr/lP+fMQs6CaqEOBIQQytF8MQwkX0kX2Bxtb0tpd9DHC2ZC9At0D3yCiHN ZUMfUKwnELhRQxqi5cSghKIXyBZFEuUbxVfU+DDXgxYaQmZcRh63WJ5CNHJUvZev5nKA e9Icy5KKHdinwBUDRh4ccJ53cckRSJ74071FGPwZAToS+KvCDchiap0uNeafqKT896E6 0XxgaGZnsLjBEhjWagM2Go6vTg2652mzhWUPhTJB+PeLdtm1r29zqMcVB37SJcNwjQq3 1d/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=byILJkAAw3XerZaPKju5iznVAvPOZfX2byM0TS0ipOdD/xWgGxXHvwWmug2lOfJd/Q wq46Gp6uR89Qp+yDdGgC8M2XNjxunuUUsGTmU/bASgsIrfKXUZAJnpxGsfc9h2npCiBN il8Os5kyI2UCggBNunJUTlDmZUXZ7x0P4nKgUoiohX+lwXLvwFFX81zbfUjtW7aNV77L JefkIywB3Ny8bl8vPbYACtmgPjoW/f5pnalqNkV8n+7zZdQrx3W32tFBi2ep1Rri5umI e/CTzE+OdNTR9oUHW9LCvFwcJwLEsuNDPoi5/x+TzPv57ZG0qjE3Hc+vbMfDxQ0DmZKO ts2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ggzu6F2R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w12si6334380qtn.272.2020.03.02.10.22.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:22:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ggzu6F2R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8piS-00019e-OH for patch@linaro.org; Mon, 02 Mar 2020 13:22:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002Xr-Tp for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001EI-Fr for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:38158) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-00019i-9E for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x429.google.com with SMTP id t11so983931wrw.5 for ; Mon, 02 Mar 2020 10:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=ggzu6F2Rbxl79fGhkDUyBM16K3abHaWTrABJHewKUCzSaJpB2PrWdvtwayeO1tS2J+ VNqqEXu+aODvWEB7gfrsBLU0NcA6QZqZ8uBos+K6UA55MkQVPGZ3M5BfwX304QN40L+4 kcyapHCEi9Cxa78lv1k5ltur2Hk+q91+hfp3auxUGaC/9NdEsAGR40vOEN47L7kzRbS0 o/Dit0bfq3HL7wgzzEVQmnuxzZRBQggBAf2mOFDbYW/56y5lbKyROgb4skB0PJ3i/4Q/ cWYEBQ3qHdTe4uzJy+nFA2sfTfZNrRXe6dhO8fe2r40H+DWU1XQshlHlJBXY7S2j5h8z 9vhA== 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=dCr0Z8PfAqS4rx+S0HXKAf2zVkW9ZlqRt2oF49qU2FA=; b=tGkEM8+o/tU69PYBHFWk73sd04ugW3H/NjIC5BN/KbfoHossvHGNMB51wnkh2QpbjC Gscxl5tO29W7qOAcz8b7A4iXk/OwJ0w/wALGmh+WPUjdyhVvNAdP3FRF4vkwtSTgvGiU NQBfPgclpUjjJ+iJOrECvMHm5dRhWdMADk8HcV9xVDiohlvaVYl7NUlljz07u5wN+82J ZSssvKU/L/6tf3BdVZFvkNNl2tJRwqQjgIwx4bAK6gbh/fad/QLF9OtrnufuPOwXvpNW /4KLqShxKkDuMi0oALCzQ2utRNhLfWxZXik2AvObarQhRpx+PsxTpmRkTXNRSIvBQVvh rk4w== X-Gm-Message-State: ANhLgQ3LhcHSUq7cKSG6k7lcegzfZ1BLPhQID42a+GnA7r/YrnEXSqe3 t1PgkzWIbkYiPA/6pwUBbicwiw== X-Received: by 2002:a05:6000:4b:: with SMTP id k11mr805024wrx.362.1583173153067; Mon, 02 Mar 2020 10:19:13 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z12sm2842292wrs.43.2020.03.02.10.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:09 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE5841FF90; Mon, 2 Mar 2020 18:19:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/10] tests/vm: increased max timeout for vm boot. Date: Mon, 2 Mar 2020 18:19:00 +0000 Message-Id: <20200302181907.32110-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 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 , Peter Puhov , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Foley , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Add change to increase timeout waiting for VM to boot. Needed for some emulation cases where it can take longer than 5 minutes to boot. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Peter Puhov Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-4-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index c99725b8c0d..5ca445e29af 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -57,6 +57,10 @@ class BaseVM(object): poweroff = "poweroff" # enable IPv6 networking ipv6 = True + # Scale up some timeouts under TCG. + # 4 is arbitrary, but greater than 2, + # since we found we need to wait more than twice as long. + tcg_ssh_timeout_multiplier = 4 def __init__(self, debug=False, vcpus=None): self._guest = None self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-", @@ -309,6 +313,9 @@ class BaseVM(object): sys.stderr.write("### %s ...\n" % text) def wait_ssh(self, seconds=300): + # Allow more time for VM to boot under TCG. + if not kvm_available(self.arch): + seconds *= self.tcg_ssh_timeout_multiplier starttime = datetime.datetime.now() endtime = starttime + datetime.timedelta(seconds=seconds) guest_up = False From patchwork Mon Mar 2 18:19:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184115 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2708392ile; Mon, 2 Mar 2020 10:27:34 -0800 (PST) X-Google-Smtp-Source: ADFU+vvFrAUQpevrBGWXHeCwlzxHf59ldmplQ5noFg3teBNLsI9wFzEL8g2sDIdFXsMc6HdQ9Mo4 X-Received: by 2002:ac8:5208:: with SMTP id r8mr969884qtn.131.1583173654019; Mon, 02 Mar 2020 10:27:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173654; cv=none; d=google.com; s=arc-20160816; b=aKQgHg55kHSxBd1Xwps7JnCnzw/hNd7m5RhIK5d5oBc+1HEkBzKZgK6r1fKNe+z9yo 6ghTdy9inX1hZwqRWR3hyQF7l7EmDVTx87ITEskdrMLrPfq7TxPgJhrIaboyGFmTWW+l rAfxWl68Pu3D0DQJ+/7ViHiVDOE/XLuZ+sOCUzXZmJlR54eEVMnfC8AITgpe5P5Xfb8f 8685ximXXcnkbojzr59dxm2RZSZiEerKYpQjaWALDBUetQWDehEL6Jap4ZZbcn246NdL jbho4lSaDptOtJR2YbKChlZinWjkOkeuuFk8fQ7Oxog/CWbYj7M5FtN40BTnlPJI/Uo0 5eEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=vhuLycpqpjk3VvFY7MFiwrFUjqJWzDKnBQgC0lIHCenFcBTVr9nJD+Js3zg35YWLad JkhmtKquLeSARGtlRPf46SaxI5VZlV9cc/kp6OwRxEOdoux7qL8ZyGIYxNgQAurlrCZc HDW2IoO+QmR64lBDfdfFvrfw8b2PtnXSw69S9NGAUQl31qj0aahydPc3+pdG6zNZCqu4 NRmLrga0eWe403VWLSkDvH3RG7NG5zhTjU0WJpULni2QeMniI5GfwKtZojGnTSGE8ANq AufuU6sRadGm6twDJn9Ntp0JZ6psePFCYRzOuma8dGDWWlrcGtZMhzlAVayjH1Uxrcq6 LHiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eVNXvTqx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x10si5964593qkx.36.2020.03.02.10.27.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:27:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eVNXvTqx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pmv-0007OC-JE for patch@linaro.org; Mon, 02 Mar 2020 13:27:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43586) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002We-9Z for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001DH-5f for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42123) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfB-00019h-Ut for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x441.google.com with SMTP id z11so946908wro.9 for ; Mon, 02 Mar 2020 10:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=eVNXvTqxkgzp4va17Wq3iQBjA4MXaCuf/mi2kTxN7+BnJfrGJ/LEiv4gChYnjs+J8q xN0IZs8pugYKpJk8MnGpicMVLY9uVJ1vkzzplxOFCp16JQ4Ii4stWBZgMaRh19mMA6eZ YKPRFiVeAd4QGz+rHbRSyqUCm5UPW8jHnV9DEbtFpl/0LM/20t7uWbtECXgKxpDaoql4 SCvPXTRDW/k+2CZoj0qT00zaHUj547W+N9oK72FxY5yyrRHeMvZZfPnqIM8BcS2BEAZu AxRTw2GCouxpDYNBN5le86ILVCzTFdfEEmVsal3RZIUM7gfIIGslHYjceP6ORWqbc/c1 b64Q== 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=Z7tiVgE0/FNumYwGDaf9+n6Hr38jcg9tS9OSWzqMpF0=; b=FIAKUCTRVklzomC47TZG/YXTVZtxFukHgTg73gStQf8u8gBlhIv9uBmP2b6k3y9ce7 dDz2e6gL0nVfMPkOLe+Ud+6Onxy1WH+SyO4TaANnMdvtkBdJtpWdnuTE61fKRnbEKwdV q7QY2TteHSR0G17yF4BbG6eHK9FmbYnVrCDi3PqTyX+NITXIZZ/VEC3r9kvGShKD0oBA PN6folNpbI201qJPIErMbxX31SC+fP0PKHCcXxZjK6QtecGWF4jE/WQ864DLoPiYA8Xj DozqL8pW178GZkXbQ3RzafiJEIkqP5laOzuxDGb0LiET4JFyPQ2ZvdooGX3BteIzY2PY QmZw== X-Gm-Message-State: ANhLgQ2eqHyGLsYz/swIAD0CMifOyMDKa6sJgz3E7QU8sEsEofkhshtZ eXNpKoHw/f05dpECX0jZGVeXtQ== X-Received: by 2002:a5d:69cb:: with SMTP id s11mr758325wrw.47.1583173152151; Mon, 02 Mar 2020 10:19:12 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm318344wme.36.2020.03.02.10.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:09 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D4F031FF91; Mon, 2 Mar 2020 18:19:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/10] tests/vm: give wait_ssh() option to wait for root Date: Mon, 2 Mar 2020 18:19:01 +0000 Message-Id: <20200302181907.32110-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 Zheng , Peter Puhov , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Foley , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Allow wait_ssh to wait for root user to be ready. This solves the issue where we perform a wait_ssh() successfully, but the root user is not yet ready to be logged in. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Peter Puhov Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-5-robert.foley@linaro.org> --- tests/vm/basevm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5ca445e29af..7f268922685 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -312,7 +312,7 @@ class BaseVM(object): def print_step(self, text): sys.stderr.write("### %s ...\n" % text) - def wait_ssh(self, seconds=300): + def wait_ssh(self, wait_root=False, seconds=300): # Allow more time for VM to boot under TCG. if not kvm_available(self.arch): seconds *= self.tcg_ssh_timeout_multiplier @@ -320,7 +320,10 @@ class BaseVM(object): endtime = starttime + datetime.timedelta(seconds=seconds) guest_up = False while datetime.datetime.now() < endtime: - if self.ssh("exit 0") == 0: + if wait_root and self.ssh_root("exit 0") == 0: + guest_up = True + break + elif self.ssh("exit 0") == 0: guest_up = True break seconds = (endtime - datetime.datetime.now()).total_seconds() From patchwork Mon Mar 2 18:19:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184112 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2704655ile; Mon, 2 Mar 2020 10:23:09 -0800 (PST) X-Google-Smtp-Source: ADFU+vuqYV9vOoc5X0qDXo4UXvmpbbFuY96SzcZxSz8lrAO9W1xwi+MykNv166ptjEsqbBbK5nZx X-Received: by 2002:a05:620a:15cf:: with SMTP id o15mr569013qkm.140.1583173389300; Mon, 02 Mar 2020 10:23:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173389; cv=none; d=google.com; s=arc-20160816; b=fN1Sge6HQEK5C5lkHYAE4bjeEfbqsZ84dKD/AnwRYr+SgFONJv0F0PIvIz0gL9CJ3j bUyiNiOVNwh79pjkQEDI79uTnexfqdMw+3GcLnMbMhhA/ltGDAObNZvn6K+I8aDXLkHH uqFdzd4b1S4n19/i6X7mncsI5/jB9bRZlSAsLvhDSjRKVheaPRpK/X7PmiAkSsGae/9M 8bPDHxEb5pGM1lpshP9I6n1GfuylVPGTXtxfZX5n+9QbR/QhjHipmerh1a6f+SSEfflk tDqMmbxK6otjcSaMnSsh4X8WPg8N1kzLVWvvmNGCRUe0hGmY698eTnGVUvCbq/2xbBna CSYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NkwU9mGQ3UXDblL8+agKWJfAotwiWnzLlTiheha46Qg=; b=cBB1acUcZVxXF/+Ki+2JwNoj1G5vvl8O7lyit35Mox5a54nFrKAfUx3kjRD6z/kype gdONIBwoHPefYlFmhrJ194AaDCxH5MMAVFSqMfvDNB8cDY2m6rIpBWzMncR7hGe0AZb1 DzufcN2zj28bN+P6fhFrFkcqVV3gY6KLS72LA4QeNZ68A6zIYflVutX8JMlhxFnOB0EX 9Ce4ZL6fpFpws7tS84TxjAoel+pn+enGQCevFtJkKpWlCi8WfTwxVP8iN7Fw0N8YlX5v RNtX8yn1Qe50Ydgw9gBADxE0d1NCR9vn9BhsZiiWVbFS3nKZnqYAWkTNVq0BZP6o79K9 IITQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cgYGwxUD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c1si6714458qtm.165.2020.03.02.10.23.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:23:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cgYGwxUD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pie-0001Ip-QZ for patch@linaro.org; Mon, 02 Mar 2020 13:23:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43622) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfE-0002Y4-0Y for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001D8-1H for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41775) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfB-00019z-QY for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:33 -0500 Received: by mail-wr1-x42d.google.com with SMTP id v4so960035wrs.8 for ; Mon, 02 Mar 2020 10:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NkwU9mGQ3UXDblL8+agKWJfAotwiWnzLlTiheha46Qg=; b=cgYGwxUDDOlaLwK7L/lNp0RCQHf954KKY2n7ByHYHf3cLfTPLn3TTrLvMWk6oBwaZa AMFNt9R4dgviERnJGg1ZG7ftMomg9m/36ifzY13dq6yGQnzRsMYGXmLhTOTfA55WGguR s5pqzgP+suuvTcGPt7taRCA8OZtGd7fmmvg8ZqJ4qyKXbcFVw0eyqzTgfvpEDrX3okGd 4Gv037Ski6l7MqgLPNFtwRle2aKQj4mnDu/mDP4YmYbzKJdm+OZ8YQg6A5CkFlaIuQCz Z2eR5Sn4fBNfa3gibb4MVN9javMHeJJzdkkiOUm7Zha+8yqLIOrr0QQbIiRtUoeQMJcs gTqw== 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=NkwU9mGQ3UXDblL8+agKWJfAotwiWnzLlTiheha46Qg=; b=WXC3vJWLEKy4e6v7OIzs4P/a8NcTxFtsmr838Y0vIQTT5zDA5S41Uc4111ACvYUcIh yR41Xj82KHRge+OnVOcuNxyx+Z2Q4Pgq70w8SQth1faYzQblOs9S/3zW1PilteUaaHuU 56ZCtOMJgbBIRMpQyPfkwfJvR5qYbA80YU6hNKVncFi4tjlhu6gKvgL9Z139qc2FONcb XsqxEnAhHBlSWSLm4l7gbJskrXl3HZ7nOP6ayaqlID/ZKnpYe5BJ45yUOt6k1FoxQwqA FeKBviJDhPm0FwYqngXnjkPtCjRI/xiD/ik4RiNVMCYf+39whPW0laAJxxAi6dvUTFRH PJ5Q== X-Gm-Message-State: ANhLgQ2/vL7SBFG2MPDUX638GUM71nDdp8tesGDqg/38n629ruagR8tZ MyVrVG9dZJFDw/SLiYr4muzIcg== X-Received: by 2002:adf:b601:: with SMTP id f1mr862408wre.103.1583173155707; Mon, 02 Mar 2020 10:19:15 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k7sm300866wmi.19.2020.03.02.10.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:10 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F35A61FF92; Mon, 2 Mar 2020 18:19:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/10] tests/vm: Added gen_cloud_init_iso() to basevm.py Date: Mon, 2 Mar 2020 18:19:02 +0000 Message-Id: <20200302181907.32110-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 Zheng , Peter Puhov , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Foley , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley This method was located in both centos and ubuntu.i386. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Reviewed-by: Peter Puhov Signed-off-by: Alex Bennée Message-Id: <20200219163537.22098-6-robert.foley@linaro.org> --- tests/vm/basevm.py | 40 ++++++++++++++++++++++++++++++++++++++++ tests/vm/centos | 33 +-------------------------------- tests/vm/ubuntu.i386 | 37 +------------------------------------ 3 files changed, 42 insertions(+), 68 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 7f268922685..8400b0e07f6 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -345,6 +345,46 @@ class BaseVM(object): def qmp(self, *args, **kwargs): return self._guest.qmp(*args, **kwargs) + def gen_cloud_init_iso(self): + cidir = self._tmpdir + mdata = open(os.path.join(cidir, "meta-data"), "w") + name = self.name.replace(".","-") + mdata.writelines(["instance-id: {}-vm-0\n".format(name), + "local-hostname: {}-guest\n".format(name)]) + mdata.close() + udata = open(os.path.join(cidir, "user-data"), "w") + print("guest user:pw {}:{}".format(self._config['guest_user'], + self._config['guest_pass'])) + udata.writelines(["#cloud-config\n", + "chpasswd:\n", + " list: |\n", + " root:%s\n" % self._config['root_pass'], + " %s:%s\n" % (self._config['guest_user'], + self._config['guest_pass']), + " expire: False\n", + "users:\n", + " - name: %s\n" % self._config['guest_user'], + " sudo: ALL=(ALL) NOPASSWD:ALL\n", + " ssh-authorized-keys:\n", + " - %s\n" % self._config['ssh_pub_key'], + " - name: root\n", + " ssh-authorized-keys:\n", + " - %s\n" % self._config['ssh_pub_key'], + "locale: en_US.UTF-8\n"]) + proxy = os.environ.get("http_proxy") + if not proxy is None: + udata.writelines(["apt:\n", + " proxy: %s" % proxy]) + udata.close() + subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", + "-volid", "cidata", "-joliet", "-rock", + "user-data", "meta-data"], + cwd=cidir, + stdin=self._devnull, stdout=self._stdout, + stderr=self._stdout) + + return os.path.join(cidir, "cloud-init.iso") + def parse_args(vmcls): def get_default_jobs(): diff --git a/tests/vm/centos b/tests/vm/centos index a41ff109eb5..0ad4ecf4190 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -31,37 +31,6 @@ class CentosVM(basevm.BaseVM): make docker-test-mingw@fedora {verbose} J={jobs} NETWORK=1; """ - def _gen_cloud_init_iso(self): - cidir = self._tmpdir - mdata = open(os.path.join(cidir, "meta-data"), "w") - mdata.writelines(["instance-id: centos-vm-0\n", - "local-hostname: centos-guest\n"]) - mdata.close() - udata = open(os.path.join(cidir, "user-data"), "w") - udata.writelines(["#cloud-config\n", - "chpasswd:\n", - " list: |\n", - " root:%s\n" % self.ROOT_PASS, - " %s:%s\n" % (self.GUEST_USER, self.GUEST_PASS), - " expire: False\n", - "users:\n", - " - name: %s\n" % self.GUEST_USER, - " sudo: ALL=(ALL) NOPASSWD:ALL\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - " - name: root\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - "locale: en_US.UTF-8\n"]) - udata.close() - subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", - "-volid", "cidata", "-joliet", "-rock", - "user-data", "meta-data"], - cwd=cidir, - stdin=self._devnull, stdout=self._stdout, - stderr=self._stdout) - return os.path.join(cidir, "cloud-init.iso") - def build_image(self, img): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = img + ".tmp" @@ -69,7 +38,7 @@ class CentosVM(basevm.BaseVM): subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) + self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("yum update -y") diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 48e9cb1ad3d..3266038fbde 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -29,41 +29,6 @@ class UbuntuX86VM(basevm.BaseVM): make --output-sync {target} -j{jobs} {verbose}; """ - def _gen_cloud_init_iso(self): - cidir = self._tmpdir - mdata = open(os.path.join(cidir, "meta-data"), "w") - mdata.writelines(["instance-id: ubuntu-vm-0\n", - "local-hostname: ubuntu-guest\n"]) - mdata.close() - udata = open(os.path.join(cidir, "user-data"), "w") - udata.writelines(["#cloud-config\n", - "chpasswd:\n", - " list: |\n", - " root:%s\n" % self.ROOT_PASS, - " %s:%s\n" % (self.GUEST_USER, self.GUEST_PASS), - " expire: False\n", - "users:\n", - " - name: %s\n" % self.GUEST_USER, - " sudo: ALL=(ALL) NOPASSWD:ALL\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - " - name: root\n", - " ssh-authorized-keys:\n", - " - %s\n" % basevm.SSH_PUB_KEY, - "locale: en_US.UTF-8\n"]) - proxy = os.environ.get("http_proxy") - if not proxy is None: - udata.writelines(["apt:\n", - " proxy: %s" % proxy]) - udata.close() - subprocess.check_call(["genisoimage", "-output", "cloud-init.iso", - "-volid", "cidata", "-joliet", "-rock", - "user-data", "meta-data"], - cwd=cidir, - stdin=self._devnull, stdout=self._stdout, - stderr=self._stdout) - return os.path.join(cidir, "cloud-init.iso") - def build_image(self, img): cimg = self._download_with_cache( "https://cloud-images.ubuntu.com/releases/bionic/release-20191114/ubuntu-18.04-server-cloudimg-i386.img", @@ -71,7 +36,7 @@ class UbuntuX86VM(basevm.BaseVM): img_tmp = img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) + self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("apt-get update") From patchwork Mon Mar 2 18:19:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184106 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2703004ile; Mon, 2 Mar 2020 10:21:15 -0800 (PST) X-Google-Smtp-Source: ADFU+vt0Iyu2uauV1kC2bkComz6MMW1Fc78k2q4PB6DTwWSaNNhIuUQawT7Xp3Xhc8jYCoI2TnWS X-Received: by 2002:ac8:6909:: with SMTP id e9mr940871qtr.324.1583173275430; Mon, 02 Mar 2020 10:21:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173275; cv=none; d=google.com; s=arc-20160816; b=YCdVWoDM+j7BLloa/gSipWU/Q2lrrvf6nWsNZ33sjIQwi4PzmjfC52+hO57F1J1fBz DP+bfHobCEdjT2WiUtK38oM7/TyFh/BnNJ3lm+sFhR56XoUYsTMGGqnjk9Hq/drUuD+t hSkRNpqQYOyl9AC8F9UWsUAiUqMikCLIFVD6vrR/dLdOqKSIHq8kPa6rXv+F2Esi8BVc hTi4Ip9CeYqHz/lZR2iCL+27uw25MgGqeXm7TR4HOd5+9Sd8PDFL/6Newm9ZQ2mtTttg UxmmVPhkQ9lcYpNelqZB4CxywQ6snlOfPaD6Spc9FFTzk6jGFw2MgwRJmkXqO93a6Xis hIHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=x+xzICjnYoZ7kFe0us/GQm6SY8Zr24nak+KbUFj0hp8=; b=z0YqLQoRZgnTeFmW4O0FBjPXfxaJJfW8GJ/iYgAxOJV50jJPundNMAazQCCNPBtfu9 HzUVxTP6MycOGsYJblYtgocjEuyHpXVtB/NzuhnzLFjTdaHiLvuQBCsJJBZmLjHYCHfV 92UG4yW4lMEFzVGEx9/b2vBeSJ9bAxAX+1r2CmX3Sc6xD+gVs8sKL0Fn4lftkbjPV3WX 9gZjlZoeoI/u67h78ZqgxhyYWaNihsTavgOyYntbo4qyRItOMmT+5aDhEFraw3SwpLmF IUHwKzmgDI9MznV1EY6rAxfC5PNVcf24EDj/kuIdnmbnEaxwh0AMg5f5SXP6Q+TQ1QD3 GVYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cBcVfexS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w15si2252154qtv.157.2020.03.02.10.21.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:21:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cBcVfexS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pgo-0006Iw-UX for patch@linaro.org; Mon, 02 Mar 2020 13:21:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002W9-36 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfB-0001D2-Ty for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:35331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfB-00019u-O6 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:33 -0500 Received: by mail-wm1-x331.google.com with SMTP id m3so100420wmi.0 for ; Mon, 02 Mar 2020 10:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x+xzICjnYoZ7kFe0us/GQm6SY8Zr24nak+KbUFj0hp8=; b=cBcVfexSFHIorNR7WzVAEXvpXrC3SRLxsPcFM0Pt278BKNF8arXVz7AIAb2JX0ENZv zsfSufMu8rkPY2AygRBvFvn47TsGqSweFmXz5HOp1j1uT3smay4A3RF0qchbhslaJICQ E/B7qZUyeh7/on2owCdOf3y6LWWjEpfGiqAjuYn7zHXGh1ubaXGBWFhL08qqtKr7RC18 S5vO8pcQArDUfD3ytqeZd2fzbRTljSzzwPkzY1ht4nrZqCQGcKLxHBvBDwjafuIilri7 sqitM85OAVrn2CLkTFuRyHaos5n4xQmwW2Ei6CjMsAAFHvqPuhovJHOnLnv10gAaUJZt wDqg== 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=x+xzICjnYoZ7kFe0us/GQm6SY8Zr24nak+KbUFj0hp8=; b=A9vC6jxOMLImF4TBTWXLHM3LWZhhItLy2UXjYv3lSR9NHpBmpYaSX0qRmnu9ooL2pj rHpUSCdtWrrVsJHmWsYx8s5soMkOxUgHpfrLNS6gOZqwRKt8R2S3r1TJ5SeilmzXI6wO yPwV8+KYeZnGGk4VwQMHdC0l4eTpBsuJaPUEyNFWQhovcgl+RmElRUa/weA9FBodAX0k MFBZc7ktkRAgnlsYkC9JEC3j6Ye+92IxfjT62llmoXhfkj2RIFiAlpB7QgSTSqA3Hfq2 ScSO/ekKGGj3ONcYnrXmXW4ZZA/quD9KEri9cvzLnWBUewK3p01ipXp8ss/wPaIPwXxk VDFw== X-Gm-Message-State: ANhLgQ2M4s0veVWVQEQ3DJyYaVj+kVOtc37fa6O6jLZEfhcmu390HFuI vr2t5bO2Sp+xtx6aQt4q/jYk4Q== X-Received: by 2002:a1c:ba87:: with SMTP id k129mr113188wmf.102.1583173154654; Mon, 02 Mar 2020 10:19:14 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i7sm335893wma.32.2020.03.02.10.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:10 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 12CFB1FF93; Mon, 2 Mar 2020 18:19:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/10] travis: enable tools build on OS X Date: Mon, 2 Mar 2020 18:19:03 +0000 Message-Id: <20200302181907.32110-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 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: Laurent Vivier , Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier As we can build tools on OS X we should check we don't break build when we submit new codes. Signed-off-by: Laurent Vivier Signed-off-by: Alex Bennée Message-Id: <20200302154630.45620-3-lvivier@redhat.com> --- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index 9867272177d..70a24bf2fc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -273,6 +273,7 @@ jobs: - name: "OSX Xcode 10.3" env: + - BASE_CONFIG="--disable-docs --enable-tools" - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" os: osx osx_image: xcode10.3 From patchwork Mon Mar 2 18:19:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184110 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2704458ile; Mon, 2 Mar 2020 10:22:54 -0800 (PST) X-Google-Smtp-Source: ADFU+vusoq+pU1HF7JCbbGJ9Pi21H0IFV/aXrmstzFflLBqeGwlk2z1qriYEu/StVjc7qENIeuAP X-Received: by 2002:a37:498b:: with SMTP id w133mr567745qka.52.1583173374552; Mon, 02 Mar 2020 10:22:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173374; cv=none; d=google.com; s=arc-20160816; b=o0FokK7v34GaNg58Y1l5xyzMmjP0WaqGEvZQ+K+J5fxzMM6FaoA5jMb0Dc13rMILKE 71zhtLAqq+cWiyyXmNu+a4AJLCXyoNRy+ehMMxU9EcTbMNYz3thPT8/baJowg7TOltNT azsaNHO1rcwDN4pQnDtEz/rhpwAt5kLKqpx5dtbnYRa24kVJPqrAaHRZtdbJ/HGvzkGQ B9sGBPkvYMh35KUweGVdazTpGWO4L5C8UK2KRgTU9T4KeEohun95/RRCGPPs0Dggu2HY lOn55TUzEsleaq2CAVAh11P7sp6KJEWonkTJtgk73L3vTuxXggPa/J6FroUouh+PvxLC IJEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=4KU3LOvTwsyaeX9nvxbxSpYARm+tonMTUIfAMh78os0=; b=knz5E1GO73nD2lLTew+jOxtzUEEbiWl62S0LWMfIJ5HhEdVqIEXf/b59MifnokSmL8 Ri9RxVIYz/l491M9bN7qjg2XM5xRVbMeo0u8SBoXjRGKlYQfK4db7la5ZEWI/eE75D4F tEd1BL2O8vhdbC55cPFKkBv/Uwwi+D8oyX5z2T4ogswFN+WBAC42gxwdEvXqXJLeqPIa Nxjl+s+UmuPT0jLQKAYtIWujrlUhAxaFjcMlSbKaOv7i1A86WKlF1n1HNH/dNNRbmZE5 xTLQLLmGT1YbyqY2MSEIL3tp5k7ujThqLh0Y0w7OJeLDekmAwhl4/Jg/SWF9f3dnQsRZ w3ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fDGgYIm+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g33si4368668qtc.79.2020.03.02.10.22.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:22:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fDGgYIm+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8piQ-0000l6-3l for patch@linaro.org; Mon, 02 Mar 2020 13:22:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43583) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002Wd-8r for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001DO-6g for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:35545) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-0001AT-0c for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x42f.google.com with SMTP id r7so1016247wro.2 for ; Mon, 02 Mar 2020 10:19:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4KU3LOvTwsyaeX9nvxbxSpYARm+tonMTUIfAMh78os0=; b=fDGgYIm+GYDEYqSOL9F679XDxp7ueHS06DJNbu43+qlVBd46SgJk4AdBBD5VL0cXbj ardI9ITnMqmmkDt18M9I9q8Q0/Pv1i02DwqVB4dYDb+bMGQlrYrI45QDfMg3UnAc+mqg ynxD2333GXZEUlpnDs9FYCDGUWNJhUVHN/EPQdhD5v6429NrDa+B6LMEJHEJ9YclbWrl Wp/UhiYyeeEthwazigaqMsNLahSIOzWgKPZbn33pYBr808POehvUg3OSPBxEj1Cw20gs 0Ks3z44yTx/RR51uCIoiJ6/N/dfyhRbd9eANIrI3ylu8uOfoAJvzC39QJBLINtayMi33 tIiw== 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=4KU3LOvTwsyaeX9nvxbxSpYARm+tonMTUIfAMh78os0=; b=roOthYhT9fUVxApDMwVRMie6wL2/zzd8/wGIf989sqrvhE+tgcxBI79RyTjeOvcvAp c3uFu7mWW58IJ6aY3qHzgauJCUCDsMiLso+bKmB70daCcd+VQ7Nw66xF27mqP4obRznU vd77ENh/KfQ+IWgvXw1mWBgTKdKXBw9/L3p+kPZ4nwv3DjilNVjEw6nMGpQtmcFpehtp hBxojjMLimNNoT/REehzW3YiFh3ZyON+VnL+jQYeHn9YeTEDXKQ7vXnsJ+pZsSkMIGFd IYt/DRFmwSPXPd0MfgZWK4KEoBoIgGVUS/m7WpiJSUq4cdlxTg5XJxCxRvZcDodpJftQ casQ== X-Gm-Message-State: ANhLgQ2vsPfuZNg1ijTCJKm2YwUD9rE19eTIL1WxZDgFHbHwKWUwlof9 j54DmKCq3CWi1KCvG3uA0/KcOw== X-Received: by 2002:a05:6000:106:: with SMTP id o6mr818424wrx.120.1583173157967; Mon, 02 Mar 2020 10:19:17 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c8sm3011901wrt.19.2020.03.02.10.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:13 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 25C1F1FF96; Mon, 2 Mar 2020 18:19:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/10] configure: fix check for libzstd Date: Mon, 2 Mar 2020 18:19:04 +0000 Message-Id: <20200302181907.32110-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f 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_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fixes: 3a67848134d0 Signed-off-by: Alex Bennée --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/configure b/configure index 7b373bc0bb8..caa65f58831 100755 --- a/configure +++ b/configure @@ -2464,7 +2464,7 @@ fi # zstd check if test "$zstd" != "no" ; then - if $pkg_config --exist libzstd ; then + if $pkg_config --exists libzstd ; then zstd_cflags="$($pkg_config --cflags libzstd)" zstd_libs="$($pkg_config --libs libzstd)" LIBS="$zstd_libs $LIBS" From patchwork Mon Mar 2 18:19:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184107 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2703486ile; Mon, 2 Mar 2020 10:21:52 -0800 (PST) X-Google-Smtp-Source: ADFU+vsuvesMSQXfkb+tveacX+WbXsmfZRBgFsfW/S/IuasQuJV91b6oswp1PlibeTxSBwgZmuWx X-Received: by 2002:a0c:ca94:: with SMTP id a20mr642738qvk.150.1583173312733; Mon, 02 Mar 2020 10:21:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173312; cv=none; d=google.com; s=arc-20160816; b=NifJeye6Ly95ONE9vxCk/Yw6/w++OU1+SYI3BcydbaV9W/+wGlr6MkJFPCfTvb26jp yecG7SjhMdpx/8M3QtX5sWyeDBES+UdDfVO3izxoQhho0LWWyt96PFvNvw22tceA7clC 4evJpG3PURa1Spxl/Bk4nYWSpolf2W6Q8su0paXeAz7Q9mwG5hdmcCvNpjXh/mjPtur8 NAFfPPbUjByQVLysAJvMqksh17ftftL7ckbm+b5bfknPqVgbgDREJZR9RW4iNFlufocz 6tDUhA9mVLImYVOKT2Y7WpNpLDocW8OVwN+sT1W9uifOLBlxohB2st+FGLKdmsE5YlgZ Y4mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=65Txf0NtQrDZ1B5f2IUJMSN/X+Wm8MrtnU1Cud0aVmk=; b=kTFdP7wQ4kOe0tYRUwxJRxE7I2iYFJ27cG0NvtdrisRS1MubrzWNddiJQU1G6aaCRp cK3g0DxATgQbLOivY0ZeXSGWO2mT+2J1QhCa2+EbHRr/6Rs07JneHp9sHsn8YxN2GQQ4 +PlHPljTXV6aeSFVDf9CiLVzHn9r4FtVLJO2Hk8aYPXh9rUa0IgbkNHvETEm0fwt6wpr PMhgseW/50b6uPe+8KRxdhAsGZ8ROOC6HiScgPs2/tLJnV7fRRMmKYGhRHeCaahk4nEH DGKhAjZyks7xcL3ZCe3VTgm+V3FJ838IzBwuzp/7t5IU9fkNWaRIq9fdACzQgZsLUXmY Le+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baZCwyYN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p46si5996770qte.143.2020.03.02.10.21.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:21:52 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baZCwyYN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8phQ-0007Ur-8e for patch@linaro.org; Mon, 02 Mar 2020 13:21:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002XH-Jf for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001DT-72 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-0001AO-0e for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x430.google.com with SMTP id x7so1033989wrr.0 for ; Mon, 02 Mar 2020 10:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=65Txf0NtQrDZ1B5f2IUJMSN/X+Wm8MrtnU1Cud0aVmk=; b=baZCwyYNXJIeoYtkK32eojnZSHp4XgJQOynBD3iQtaDYbCHODKRErsNnmqKvf6RhLP QzuLIIFVXaSyUuymiBhPY6Hot6SeS62ofHsPls+4wsKbw5KDDd1+tWCsmIZcjD9ebtRp 9ME5k23ZGh3lIgIqxTXJGXK6BejELYz5aTNttg3Ro37JFQlXMzeZUnCJ33QjqSp0BkQV q+qDWLSv/ZgyVAKY4I2EOiJXzA+ZottULg21XOdN7NxVQPF52Y240ppRSnRFXeMwY4Ok 4Ee+niwWZjMJci8mXoLF1QA7v4TIhNY5qUPxB7VE2Gcr+zqFxJ99q5MNYkS68wFcHVIP t6dA== 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=65Txf0NtQrDZ1B5f2IUJMSN/X+Wm8MrtnU1Cud0aVmk=; b=pqBFuXVJAlYk1kNK7FDCLeMf/11C4tp7xMxgYl53BbZeIkrvBsGVFiZhjGEunRc1GB tXPdzhwvbKIUJoVMtpfofAH46nI8Q8dSV9b5QQ42Jv9OUui5MoLhnxJDBnJ7gloCjU9+ 1Gf1aNOiwajyRJH98HMyRwoXkomVUP6H9mYFdueFMjPH5OjHeK3VaV6AD7cBxeFTcCXL dToq8XSqFNm4CD+W2jMckQgT5uQfGLcyep9As22lQHvuvuQ4ai3TydYGWfl2bVv6Ew7s Cf/Artfc/0O6Li9Yo6niibXvjBqM2tVAUjG8oARkh9+ck+BFA+ipQszQvq2hbXn+/Eyb m0EA== X-Gm-Message-State: ANhLgQ0DoQonipzE3pTNx9oYHWMbuTkZ35Cc85FTjgOFgXQ8G/fJk9XN ZDr85bwQVCWEGJf42LZH9ZVL+w== X-Received: by 2002:adf:cc85:: with SMTP id p5mr801024wrj.196.1583173156868; Mon, 02 Mar 2020 10:19:16 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z16sm28676472wrp.33.2020.03.02.10.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:13 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C9081FF98; Mon, 2 Mar 2020 18:19:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/10] configure: detect and report genisoimage Date: Mon, 2 Mar 2020 18:19:05 +0000 Message-Id: <20200302181907.32110-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is used for some of the vm-build tests so lets detect it and behave sanely when it is not installed. Signed-off-by: Alex Bennée --- configure | 13 +++++++++++++ tests/vm/Makefile.include | 14 +++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/configure b/configure index caa65f58831..376ccb25623 100755 --- a/configure +++ b/configure @@ -936,6 +936,17 @@ do fi done +# Check for ancillary tools used in testing +genisoimage= +for binary in genisoimage +do + if has $binary + then + genisoimage=$(command -v "$binary") + break + fi +done + : ${smbd=${SMBD-/usr/sbin/smbd}} # Default objcc to clang if available, otherwise use CC @@ -6567,6 +6578,7 @@ echo "python $python ($python_version)" if test "$docs" != "no"; then echo "sphinx-build $sphinx_build" fi +echo "genisoimage $genisoimage" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" != "no" ; then echo "smbd $smbd" @@ -7616,6 +7628,7 @@ echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak +echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "CC=$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=$iasl" >> $config_host_mak diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 778e5067554..1bf9693d195 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -2,7 +2,11 @@ .PHONY: vm-build-all vm-clean-all -IMAGES := ubuntu.i386 freebsd netbsd openbsd centos fedora +IMAGES := freebsd netbsd openbsd centos fedora +ifneq ($(GENISOIMAGE),) +IMAGES += ubuntu.i386 centos +endif + IMAGES_DIR := $(HOME)/.cache/qemu-vm/images IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) @@ -12,12 +16,16 @@ IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) vm-help vm-test: @echo "vm-help: Test QEMU in preconfigured virtual machines" @echo - @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" @echo " vm-build-freebsd - Build QEMU in FreeBSD VM" @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" - @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker" @echo " vm-build-fedora - Build QEMU in Fedora VM" +ifneq ($(GENISOIMAGE),) + @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker" + @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" +else + @echo " (install genisoimage to build centos/ubuntu images)" +endif @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" From patchwork Mon Mar 2 18:19:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184113 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2705891ile; Mon, 2 Mar 2020 10:24:35 -0800 (PST) X-Google-Smtp-Source: ADFU+vuazMV825RJ6I12hXFlJvSlIcLGq3AQKCMPi64duB1CpOdAqsGHNh69X5bUri65v9p2BJRi X-Received: by 2002:ac8:2fda:: with SMTP id m26mr984468qta.336.1583173475215; Mon, 02 Mar 2020 10:24:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173475; cv=none; d=google.com; s=arc-20160816; b=hAafMBuKAReYg7JP0YkBp0vCHTkk5b7VZDC638Dijkq/M9g3vMYB6mRKCIPM2/QmD3 536R8MhvfuhsI6dGVE0RWt159JqP7XbKdXr15MjtKfG50a53UIjV02BMNtK0FSmmP9ko XMP/D7FzFgb+jh8MhV12SU6bfZcLkbBvT9tLaguqswNdH73X+V6JNYNMKkaCgYJQK9GN jqy4rZI4btgtmXxkqPvCQT/WWyMlDOVaPSOJ1Ha7ntRF9hAwYJ48UTVHyglMje4jqjF0 k0EOiY+mu4s+DXG5m7YE6QOJiDunEHonw56vhq/be76PN/gB0kWo1JK3r4YxKctdFsIg u39A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=tYnjdVHVbzSLgWR2JAiiP7YknzWJrfOPrv/6EnTLir4=; b=IygqIw3YmzMYr5HBZfRdNPIZaD/Sh7PyBD9/XU6K9tIUso0T1zslhbtli0v0HeLWWO 781/MLAFtIsQfEIB8prPjQuHChPGN5qDaviqXoDBMNX70bcnUYBRxNDbI9nTsdVLy5VV Zl+v/TeTGtAEit/ojpl/J89mSbYJnZRDxKbfi96imCCToPSHz1gq4AhS3jasJNt8TG4W hceRI+74nRQCuqMzk4Ft4BOcM2/nn+2geEdKbH55cWWQJyKbrcrshWiX7FWBXmgenM7C 9uXvF9P9/Z3YSqJfOqwhWS1oeZ9qVj66Q8ORZSn/t1p03z0EALy7vuR6hAUMfMhsmp9U +ijw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i5kW+EUJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j61si6115854qte.159.2020.03.02.10.24.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:24:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i5kW+EUJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pk2-0003LD-LZ for patch@linaro.org; Mon, 02 Mar 2020 13:24:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43606) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002XT-Lq for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001Dz-Cp for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-0001Ah-6d for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x444.google.com with SMTP id v2so916510wrp.12 for ; Mon, 02 Mar 2020 10:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tYnjdVHVbzSLgWR2JAiiP7YknzWJrfOPrv/6EnTLir4=; b=i5kW+EUJgOTiBbQbUeH3wwjnVrkhYBxzK4gUOoZ2Bi7QEyZptXomYMbqBjuqWkt3Qz gypOzGRh7kTK1RPmpRzeAmoroqMYvwLKKUbsXpniDf5mjO7NNFU0cN/HI5Me82oGEQHm OD9rMZ7f3PeB8cvz2u7s4fFpite/jJSZRrj8tfzf5jPZ15rhfsNT5XR86QYzJHWgqD5z N6ckz7i+x6tGyYEkrK4PdZ/GDvpfqRwSSAMZdYhd18dk6BNRandEf5NyUR1TqeZmq17L CbtALWeO4JpjgA/wKn2KwNKj9bD1i5oyxTAYsaVxjcgRuiQGSgOkICwYH5uVxTH6Uqnr E7uw== 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=tYnjdVHVbzSLgWR2JAiiP7YknzWJrfOPrv/6EnTLir4=; b=TLnHLl+uFS/M6BCi2A+O6WzVRW6CUeGyc7m8IzC+tsqMJ0AXANP1yV9yrQ5X0JxPyD hHR4h9Vq67of8dv+h+No+xo49+E4lYZ9TU1RX5X4si/uCqD37KjFHUHa6NrgtFeWo94F BxKWB2wL1ImA1aqMXGIUetPHVPCQrYT0ZmpAs0xQ6vWnRxwRIY1NznqMJTAMlsXH7Wmt SHGySY5Kob3pNbC4P7BTRd/E3w0pbizRfdqDV4JciXqv/OG3je//cp56bpyBU4YV/o7X Tkz2fATtuOgxTKGeZWiKNn1Dgy0d/hSMzXEZiPEYp4yqDGHxahUVAawGnJxF9tgnA0xY CS3A== X-Gm-Message-State: ANhLgQ2NF5BowkDDDQqaJ1AQyW3W4CTEE4vc4CnYWEjdB8UBQOVJD8Ur O2WVNeXGfDigi2R2VDPyunhQqXEPcYA= X-Received: by 2002:adf:ee4c:: with SMTP id w12mr799274wro.310.1583173159163; Mon, 02 Mar 2020 10:19:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u1sm10876701wrt.78.2020.03.02.10.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:15 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 53B2F1FF99; Mon, 2 Mar 2020 18:19:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/10] tests/acceptance: move @skipUnless decoration to test itself Date: Mon, 2 Mar 2020 18:19:06 +0000 Message-Id: <20200302181907.32110-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 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?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It appears ignore the decoration if just applied to the class. Signed-off-by: Alex Bennée --- tests/acceptance/machine_mips_malta.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/machine_mips_malta.py index 92b4f28a112..b8fac2a44d5 100644 --- a/tests/acceptance/machine_mips_malta.py +++ b/tests/acceptance/machine_mips_malta.py @@ -30,14 +30,14 @@ except ImportError: CV2_AVAILABLE = False -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') class MaltaMachineFramebuffer(Test): timeout = 30 KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') + @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') def do_test_i6400_framebuffer_logo(self, cpu_cores_count): """ Boot Linux kernel and check Tux logo is displayed on the framebuffer. From patchwork Mon Mar 2 18:19:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184114 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2707048ile; Mon, 2 Mar 2020 10:25:59 -0800 (PST) X-Google-Smtp-Source: ADFU+vsq4FV4pUX6BQOJC7RXvLy6Q0i4NFFX3yNapHMtsRnUrIb1gFbjRr5nbKdUAY3wDmoS808Y X-Received: by 2002:aed:2a3b:: with SMTP id c56mr944464qtd.307.1583173559664; Mon, 02 Mar 2020 10:25:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173559; cv=none; d=google.com; s=arc-20160816; b=0U75r4hJt0faDOYKjrtSNRkMd2tWqUk+H142n2KiZc1aKtt6zE+SWyEB1KMSP3QsyD DZpOVefkxFkaocy02mEIpXs4PbrPCQWzfzlww/A4PLGpdAyLDvo6CXCTw90HrX41z7g9 OC0iyENCcBRZElYCkxoi976xIzhfP6HKUyUGkp9MZkK9U9jqxQzi5Ue3qKp/71VuKAxf 0M4U3P4JCnlK2SiwZffMgphBtV2laODDB6FHSVl3xSSZgXa0Aulf5/F2i1QczWuCmWTZ PpTcrSe17SKEn1l97DJyGeEfgpF8wjNT1QuS/4DsiPfEjRBQWFCBADiDLUix65P0KdjB ZV1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=0iM0DGDZ4ZSBxBSg0NI9sVRz/1idecs1gKgGJztSJQU=; b=cKgA5GnpTabz1aCbLcLIYwIFVE7mI6LSv0ER1MyO8Od7t9xyFO9YAvEdes8Ciuukxx YQSwN7FfpedakfsMHqwwVQ1esgU/QLU7dYfnnZ4jnS3MF3i0vM9ZAZf1Fdud1VLTCwrm 9NBDf2vX5QKlEQMumMJCrOnhgl19KIYy3JlU4bFKxSha6hW2ErDcrtpMBqBxQ6aVICHj G817qxKXMYLmxSFO+Lvdt19V/CLmxHocxvuRJbmWSqrZn3y7NLa1ovf6Ex44Oc0LuGcK DHmekG6GXLI9RIfIxssxVEVvxxn/Xv7eQ82qKTvU/d3jrLuI5VOSS4HsaDgIn1nVcdgb zrqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UGAo3r9w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w6si3792512qvl.107.2020.03.02.10.25.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:25:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UGAo3r9w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8plP-0005Zl-7r for patch@linaro.org; Mon, 02 Mar 2020 13:25:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43597) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002X4-FN for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001Dk-B0 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:56149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-0001Ao-4l for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wm1-x344.google.com with SMTP id 6so66052wmi.5 for ; Mon, 02 Mar 2020 10:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0iM0DGDZ4ZSBxBSg0NI9sVRz/1idecs1gKgGJztSJQU=; b=UGAo3r9wQWDMWcOmThKUwtESe8haPaY+ahWbTcQdnKWFaH9SgE4drfZiHP2nihWP+o jmVACJTJikma2UEztj1KVQ+liMqRaCYe2tJ27B26Qm+7ExMrsf+JMft7xRqS9nmrI1sH GKKBg2cE1LeB7N5K4NJRPx3JtlJOHQnT5Q1ZyOOzgQ+L3b0J5Oro2Gdl+EBqgadFu2uI 7uUi869QiP15iPVCGwYHFoSKrucez0qxzIJ3zjDF16SPkHs4Iwtb0qd5H3k46lsXnQtG WKPucjelBfnLo3VGbmzFVTdwBjOVAJgHjuRX0W+l7jdBsw2Oc789kG5o0m7FL/XUufaL oo6Q== 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=0iM0DGDZ4ZSBxBSg0NI9sVRz/1idecs1gKgGJztSJQU=; b=Xka3QLLibkfaUox9Frg1v8wtrA9uByldQdSoFni8GkTXLWutT+Ove1n3V1Yh3M7nII DjR+IUTQ6kvjPzsN2s9IB0VYrWhaqSDkYxCbLDr/RkB+ZNBmxVnaX3vqtQjWd95kxW33 yMqY6r+CcZLonNQwEAhxv/rO0h1z82bkzFNYY9xSiobc3UEkYsyAvXcE4e4+96l6+yX9 ot5pJ0YXA2N5pm1C2XFz5BCxk+25TepZxhaV9YyxF6nPjxh9WojgW5HrknmvWtrW9NLV DrOIE9dyp7tFwECFUoLXZKOuiTz1/7kvZFn3PziHhQqFBRpQmatSC6VNMj6kvzeXDn4m g5mg== X-Gm-Message-State: ANhLgQ3chHuEq65hDeUrbJJvrpZ/5DdScXECx8S+hgA7cwCY+ATIYYHV VTJ8XcKi2NrfeR8Q6wAWgRa3wQ== X-Received: by 2002:a1c:7e57:: with SMTP id z84mr297289wmc.148.1583173160098; Mon, 02 Mar 2020 10:19:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e11sm28390088wrm.80.2020.03.02.10.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:15 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67CB71FF9A; Mon, 2 Mar 2020 18:19:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/10] travis.yml: install python3 numpy and opencv libraries Date: Mon, 2 Mar 2020 18:19:07 +0000 Message-Id: <20200302181907.32110-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are used for the acceptance framebuffer tests to count Tux. Signed-off-by: Alex Bennée --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 70a24bf2fc8..9db6c1557f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -323,6 +323,8 @@ jobs: packages: - python3-pil - python3-pip + - python3-numpy + - python3-opencv - python3.5-venv - rpm2cpio - tesseract-ocr