From patchwork Wed Mar 4 10:01:46 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: 184160 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4706037ile; Wed, 4 Mar 2020 02:03:24 -0800 (PST) X-Google-Smtp-Source: ADFU+vuvYGpvUX9YInnpKAJG5qkG9pnl1v4yaDPUadm2cbR2EmgO/XfqCTS/7E+0NWvU8VFXa7Vr X-Received: by 2002:a37:a646:: with SMTP id p67mr2068859qke.124.1583316204617; Wed, 04 Mar 2020 02:03:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316204; cv=none; d=google.com; s=arc-20160816; b=K5sGGoMNTc9sTam8c0CzlA5qYnJBg9P9J9OUrB1aE6lWWA+kk4VGJGBVhLTlB9cBzf XZdF2+5dC7Fg7OJ4kUUIUeUaO6TN0Tn8QklDHCTpEGPpGuwK5xu8RKHynnskmPOWERRi OXMr7GeKnEOgbQ42FOdmeL1/K5ezQ/9liBCICHAzRGhQskQioJa73rkOia1wt6MBDfy4 3G9fhqeSTsy8WxIFOo8NZFhXW5tB8yiEixSbiZHhT6aO064a0nTR+dzD3jkQKxTNx2Zl ypkInlNsr8przQfNNrIZyPZ57curBjU1SA9Etf6GfevMZ9MTMYc7i6t7CxXR+73nPrxs 3HJg== 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=BGRHjAUypumnFL1eJKQfDSrUM7lP7pKJ1hNyJQydohM=; b=UXFdeXRXwj8MSZRg68BVygwFCZVOwDFPa+MpN1ZYPp50Tl2Qqgj3jmkbm4IXNCtKO2 F5sqHTrFHfTRCODd4ZEA+XBBnUrN36sX86OErU5Uw4Ta6UnkHe9ZN/sdobFc4gMijdDr 3y8Rs5rlYR3eH3WOQEamktJVoy3tPLdMOqToBz0grkb2cI3zpx/Q55RWSYtkAaqUoxqc jGTwb9NUPZBDD4L3pdbWlVVwpiYmLqK3ifp5jn8O7Z2pJqmxcqO0zU8lBU5qy7XmG5vx Q9TBGiQGXiE75PA74V12f8XxiXSzeDr5aPHw+zGTJAiz0v7y9GAPJfR6/mhJkyzXsFr+ 6tDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="O6Y0QJQ/"; 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 s4si677898qtj.147.2020.03.04.02.03.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:03:24 -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="O6Y0QJQ/"; 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]:59964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qs8-0000XR-06 for patch@linaro.org; Wed, 04 Mar 2020 05:03:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41591) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqm-0006zX-Lq for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqk-0000HV-Hw for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:00 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:33528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqk-0000Cs-9F for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:01:58 -0500 Received: by mail-wm1-x330.google.com with SMTP id a25so4353997wmm.0 for ; Wed, 04 Mar 2020 02:01:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BGRHjAUypumnFL1eJKQfDSrUM7lP7pKJ1hNyJQydohM=; b=O6Y0QJQ/prGVd3+be7zWcaFVJGx0oaozYmOYx/gIPsFvMTGhHHa5gg3QQyLFEDoX4w DqfnfzhZ0dJaXDHVxtXDwwEAG/0Ee+LWYczV24aUk4lxi3FYUKeVtxE2qA66+zC3nUNr pl7gCYsho7iTc3cP2kJxOhzgNr+4oP7yt69CWzaY0PKJK5zJHMyzSC/qmgE40Py5Z6ul auVEq9fj8KWTrDw93BX23s8+Wwe3H/Ntf9CJdc6qWD9zeMsCzJPkzMX5v3+K6whAgWZu 5YG1rYReuirTYZwFahVka5GfXh8cs5z9oTxe6OLcoX0m3XeLTPYQK1PylEZ8GixAWf8a s5gQ== 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=BGRHjAUypumnFL1eJKQfDSrUM7lP7pKJ1hNyJQydohM=; b=pLfLkyu2b+aBWW1JRhhQdOw4Sl4Z/jwzUSXJ0SU/NL2+FE2/hM80BxQP21PShjH3nb Ay0jxkuDpN7aHhGnKvL9/BbP6I22CJygpUDUjLJLmlh7GsbgRXCdqmT8eZmKead/N0vX f533GgzyHp6uM4RcOVWd7S1vrd+3TOFiECS0wHnyLAhssAJ3UspNoMvU5E5znqEwcrXa k7sxjdkuwr9/4bLvKIM8ATuD9+Jdbo+JZTcJfEJE0o8lM138LNKsYjRtKc77DZbdvZyC +Xep9NcbnLwsp3/taDBKUjwWvJrJKLt6vmh09+/4OZ2h5dTiGcPXa3rYL/TTQpT9b2kO IwZg== X-Gm-Message-State: ANhLgQ0EC71PQPZxq6lzeLnRyrbdeuEUITVUMxNP941O/K93Cddx470g F8pY5yasQtv1rvzZC3w2LbwNGQ== X-Received: by 2002:a7b:cf39:: with SMTP id m25mr2861694wmg.146.1583316116987; Wed, 04 Mar 2020 02:01:56 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p15sm3233657wma.40.2020.03.04.02.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:01:55 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 034CE1FF8C; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/9] tests/vm: use $(PYTHON) consistently Date: Wed, 4 Mar 2020 10:01:46 +0000 Message-Id: <20200304100154.14822-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::330 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 , Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Puhov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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 Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200219163537.22098-2-robert.foley@linaro.org> Message-Id: <20200303150622.20133-2-alex.bennee@linaro.org> -- 2.20.1 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 Wed Mar 4 10:01:47 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: 184162 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4707297ile; Wed, 4 Mar 2020 02:04:45 -0800 (PST) X-Google-Smtp-Source: ADFU+vvo2tjDlXSCL8tqfoK/qPdmPQYbW+Gpml84brWiAjwc0R7o8ZzlFl70G87kLMRdeV68CRWf X-Received: by 2002:ac8:1c0d:: with SMTP id a13mr1617566qtk.253.1583316284966; Wed, 04 Mar 2020 02:04:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316284; cv=none; d=google.com; s=arc-20160816; b=ht6TY3Bm+f4VRPgSp1GmiCIYiCyOoYYGQExQ4dF+12KYSyJB5NuGhxidQCzdlHvaRx dVq9a088tVs4HjZxwbI7axcW2pFPaWdcjKfLjfhZP1GOoFp17shVmOtkhmQsbtQB3buY XyAeUcifvTy3pLEMd5vSO9ncgrxP/DNNN0fYfmUAxg++VaCypRckVxSSrIczvkEt2fR+ OJA/h78MF3QRSdZP2bZ8Op+oEcJwL4OIsj5DMCWEhXZgJo3IsLv70/pY3bJ3Uu2JX4dE +k43GwD9dqGelZfOlf/VroOR2V0JrBAMd5IkNCtTxPKRGW17FcQ8MjkJH7pTb6MAoi2l y9eg== 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=iAaxlo38yaH/aDkZ3KTpVwewFX+cb3wfaOvBPGIDGsc=; b=KZNXC+3zJ9MD8Oq+EXMMOM5dNg7cl3g867g2L2HFcqRwID2c/eDVo9QM+WgzQCnyMY qhcMQd4/yInBpcWT9P6nr81U7c4xb7yrUcgOc5RqAXWyH4a+y6cST8fL1YrwZRyf0Bdr nt/fH8OOJ0srJKRrppD8yDqAG8PRuOC9Zmz8H3xEMmTxu8XRglhKCcjn9GHBrckEVyNv 30J3x/i99O8yANUhBukOmAV3RgQhNpyDSh0km4eYzBemAm9PJSdAacd5dB4BUHquWd+h /pL+U+PSgwc5GMEjg7qACBUlIBuztyr+HFduNPshmd7nhSMYlUEn2xo0jPJAQQ8C8SZG aV9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KrCKUIKj; 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 m40si675911qvg.89.2020.03.04.02.04.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:04:44 -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=KrCKUIKj; 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]:60000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9QtQ-0002q2-G4 for patch@linaro.org; Wed, 04 Mar 2020 05:04:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41610) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqn-0006zd-KL for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqm-0000P3-CP for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:01 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34279) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqm-0000KW-6C for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:00 -0500 Received: by mail-wr1-x432.google.com with SMTP id z15so1621682wrl.1 for ; Wed, 04 Mar 2020 02:02:00 -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=iAaxlo38yaH/aDkZ3KTpVwewFX+cb3wfaOvBPGIDGsc=; b=KrCKUIKjTyQ7CyIy9hSrRr6uLcDHt/qWqVpvVKYFH3D1yFi/peDHjbKVeXcL46TLpA lBK51FG0o1jdgrLBiZE9M27Wl14ngT1Fi5n5Ra6kc/vQt1RMWaJg91TAlgTnk0QBNXXF v7rFJQbqRZ5jwfaLwSsALnmfNacKoSVJdC5r+l/nwZvgsiqSQ23w9zO1DkHS07+U+PAb gY47fLHlCCBgFMakEobNSqkYjSYcDD50CILNb8+0WTks44vJfa3eeBLGMxwqgjuZzgZT ZbTTDVoN27sR4pOspNxPkmkzAL39rKtdQV89Vp0BGeFmBv0gya1JTMWy8eIhLIQXxMXh yt9Q== 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=iAaxlo38yaH/aDkZ3KTpVwewFX+cb3wfaOvBPGIDGsc=; b=Z7SaqKMd6oiS1JvSE4Mc9K5JB298QXsM1r1v0ewXPVJ+/EODldZdmc4Y00cwd1q8pn bjGGZFGclB5ckWCOMOjIpvKqxyRcm6jUjivOPqOlpJUd3lmLtDYT+N05ZUZRa06AnmhW ItqinVw/0m7f9KNass6TSlqlPzx2Q4ID/Nojyh9Hdl9bF42Xw0At7l8vHkV2+ohEfq6Q AO7URLu2t2yLiegpBHkiH6z09pok1xuKchv54BTMoXr30v+TXT7rVBhr5XqasqhtgcpW MYnsLQOG6arp12ml0WH2LsUqK469xS8+6Oshl9ngbvhJ9tQL71K2YEMzNm6PFnWdtTFi 2o4g== X-Gm-Message-State: ANhLgQ05OzOLC5tjdP3IEC8YcJwsXRioST9lkcdqDf1ZkMLm/XKokTwe ElqVebsgY9WmU3mhM/Iwppg0pA== X-Received: by 2002:adf:f7c1:: with SMTP id a1mr3289626wrq.299.1583316119092; Wed, 04 Mar 2020 02:01:59 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w1sm3254552wmc.11.2020.03.04.02.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:01:55 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 17F631FF8F; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/9] tests/vm: Debug mode shows ssh output. Date: Wed, 4 Mar 2020 10:01:47 +0000 Message-Id: <20200304100154.14822-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::432 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 , Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Puhov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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 Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200219163537.22098-3-robert.foley@linaro.org> Message-Id: <20200303150622.20133-3-alex.bennee@linaro.org> -- 2.20.1 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 Wed Mar 4 10:01:48 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: 184163 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4707476ile; Wed, 4 Mar 2020 02:04:55 -0800 (PST) X-Google-Smtp-Source: ADFU+vvPNOG7rkF7d9OkIScaGAUq8CMoaPlh66hsyrRbOHXKbaiPmQiT3Sr4uVqa10OBmoQOWN1H X-Received: by 2002:ac8:7101:: with SMTP id z1mr1537389qto.333.1583316295490; Wed, 04 Mar 2020 02:04:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316295; cv=none; d=google.com; s=arc-20160816; b=oa9s8fOkSTWJ2pxhF5Ds3TBiosP0rUF55R2dAIxggfDUHsfCpNB0LYNy2pg+yJNS2V 3RXyrDLq/s0I/kjyK3SwIurfU0agZuyZbAg9SLiExiUdeeQ9Q2nYwGYWSDhR+Qn+SR47 giGIU3/4T/aBmTRlvd/PmUbsWl/z91D8Kv0cTtvkRHooE1fmYO1kbGWWvYpJ5m6INEvg w8LCWLCzpgUmuK3yx8sV8ICzI8x9YWyGDpStGtHURZzORtpiSLSUnBBcDAkAgLC+R9Oe E/FsH+EtlxXVzOIxSShiyd9e18Z6V14pf055GVxJPLustPO6SQh64G0DNCKdY2Zy7KFz T5nQ== 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=1qnpQiuLu8k4ZAfo7VfU1hbr6iwSq3LWEeDvjeoy05s=; b=rQQEMOux4Evopa4e/GDpT0lIWUj2wKh75WQ77wcrA0EVLDBVdMCasZary0DJimAQnV kf8hAnga33eHG7bFjArb0VqtRaCiZsTfrScZ+jJ+2CwobF4Cba56YWcEaY4+gneQie0t vQ9JMIlEIM6gwcnr2PDLZzPWs/oWfURf9i4kf8PRVHVt1COBHW5MPBlRDT462TnFQ1hj kLcw2sZH3S14b/fsa3OuGzRYOdD7EcSDLhWXNYtC7UZH5jjTbuNzgRYsKj9OQmLIyaM9 MSBlDNb7qRrKcx1LwBVgorTxKLV/Mz4ZBadIdqLSh3RVTIufI38kzLPpFDdK2+MmAUP0 g5Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WTQsFK8Z; 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 p20si714245qtl.205.2020.03.04.02.04.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:04:55 -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=WTQsFK8Z; 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]:60008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qtb-00036y-10 for patch@linaro.org; Wed, 04 Mar 2020 05:04:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41635) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqo-0006zq-R1 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqn-0000Rp-Da for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:02 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqn-0000Q6-6r for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:01 -0500 Received: by mail-wr1-x435.google.com with SMTP id y17so1599309wrn.6 for ; Wed, 04 Mar 2020 02:02:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1qnpQiuLu8k4ZAfo7VfU1hbr6iwSq3LWEeDvjeoy05s=; b=WTQsFK8ZOUYiEx2SWDgvMUQif2MGXcPuGbUv2uehID1FM78IXF4OSq7y5hCfllxJzZ I7v20CB48BnOK4BYY2jmGmr0NWJ2pEoBbRat5zoVONGRYxhK4Pdv09kQGdxCeuhoSVXC OTnBEvlEmNUo9BPM4IyYrSkxxd8fO57PNkvZCHIAyD1Z1iPUf02FaSK1GF3HBCqxIGsK e3CwngXPS5WeY3SU4r3FhOKUOpXctMhj4p1lGCQLbdP19B1rkQ9Rp9FxMT2k25N5b6v7 1hfimFpj+yeKNW/LxlxpvB2hD6ElDtJ51s5xS7KIMS6fRABHwsDncEWHQ/6UOmynoIKl SY9w== 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=1qnpQiuLu8k4ZAfo7VfU1hbr6iwSq3LWEeDvjeoy05s=; b=GXtdjEbWKOuW1/P9wEtMyu5+PDNIBy9istpR1txLJsFezaHlJriXk5oPS6ica4e77j zhIyriJz5ZdJ3yAe0eoaxvg8l3oafyunJXyBUu7Muqg0Qr7u3iVUHgXIAULXauwTvBUt 8X2BCIXeKVQHC+uJlbnWrFFS0Pues08IFzwYFCM6CBZhKPuH+DjaVKbq6T5AaEvPnfo6 9ru/RCDYjGPo2KKJ1iOlkri6mg/2zd/aplmf0xSIjk80Z0kUWe61cKkaEo49vfUPzmNM kGWopNcEwRZWBPlJRRyG/iFY+guMfYEFeIr9rBkcIlFzjk1FhxCgIz1f28ivhToICk5f NkVA== X-Gm-Message-State: ANhLgQ1zL3CMu1wsq7MHA27X+rwsvoDqnDzFrPQuOBsFXnYPBSgpldqQ kuRR3d2r7l5Bu2OeWLrv+Kv/gQ== X-Received: by 2002:adf:ed42:: with SMTP id u2mr3398768wro.345.1583316120186; Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm4055067wme.36.2020.03.04.02.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:01:55 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C3141FF90; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/9] tests/vm: increased max timeout for vm boot. Date: Wed, 4 Mar 2020 10:01:48 +0000 Message-Id: <20200304100154.14822-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::435 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 , Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Puhov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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> Message-Id: <20200303150622.20133-4-alex.bennee@linaro.org> -- 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 Wed Mar 4 10:01:49 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: 184166 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4708464ile; Wed, 4 Mar 2020 02:06:02 -0800 (PST) X-Google-Smtp-Source: ADFU+vtPaREheMlgpNKnaf/lq2d02jbZpggcwbMNYsmA2quuGod6OVijE+MRVOYGosXPd/QOivA3 X-Received: by 2002:ae9:c012:: with SMTP id u18mr2059554qkk.140.1583316362407; Wed, 04 Mar 2020 02:06:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316362; cv=none; d=google.com; s=arc-20160816; b=Kh4Tby6l1NIpJ5RS2QYpiLn++FZWDyNeE6EtTFjCcOz/9TJO4jpripVLlbmYaz8p5d WtnUaSqC4EKMIYrCqemxKb6oRb7spqV8X7qQpQV5l0NOITj5UKrnwbZqg4W4hUjgyOId N7G9Iyjha4I9Hv7NxJJl4YdRC3BdSlsX2+71MKQd8Lvrao9tZoh6/Us2PWYHu2iq7hfK YRN5cj9ckIoh7hrawZYggYTvqRRGlgiSKJITEzToMXyEtXbFeXbouPqyQ3et/qLzrqZF u+s1lNq1BMkK8LeGZN+/N2jnGbheFi7AkPjcNG9WhfJ1QzOVcLuqoqvvmItblWTryW4U 1FmA== 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=1Z8GPfWQG9JlhViWJSouPuAdwb1TR2JLNt392yI0Vq8=; b=FmgLglLQkPn4YJX8ZZ6aVsxh2nMPJZjW70EBC4AtibpmDMmFiNCXtGqUdRNthUOs3l iN92L3GtKw4EI5YnoSyVtSUZbSR2ju44G+5I+rcX3cNHlc3wUgf+w1nHxFx8NSKrx5Ob 1jyG0fVB1WiY7/cnNFL1kYeQNsAM+QZ/v6gwKasyfkUPvrUdr0l/Gb/JZhfHKgy9wG7F ugvIg3oVrzctYau1JOXVI3R15jBdXLOCjyBjs2X/TtXFB4g/hPEBRJZSIp17eixwGqWD IhCtcoqpoCeiSTN3nN5/d12yTNUk6yVHo0pnC0GlX1sf/4paEQljAKBLeXnahqNgKjRE 9A1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MY2leZOM; 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 d82si612329qkg.211.2020.03.04.02.06.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:06:02 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MY2leZOM; 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]:60048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Quf-00053q-U7 for patch@linaro.org; Wed, 04 Mar 2020 05:06:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqu-00071g-0l for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqs-0000kK-KB for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:07 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:33486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqs-0000fp-C9 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:06 -0500 Received: by mail-wr1-x436.google.com with SMTP id x7so1627963wrr.0 for ; Wed, 04 Mar 2020 02:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1Z8GPfWQG9JlhViWJSouPuAdwb1TR2JLNt392yI0Vq8=; b=MY2leZOMGWHvBHjmG2OR7WEP52MH3U00oVeP2UCl9r8WDU/6OjxYb11m/eKh4npm3L TOnrna0EVAsEv2by9ZC2hXfYVXBuqqq175vAyMCqfx/9jgz1E+12simcJT7LjPVorNWJ 5J8bH1XaEqaaM0BrgAvwTZv1trKFkPg7ekFP8PsfOxBP7fst9WifcgBhIugDCKpXSIga jt3FlWtmovkF+a+pSfB0xAR1v0JLENwcmisRVd86d3z0TzBUB9h1P250PLHd0FHtfD4/ EQVSG1HCcjFeAg/zpj4QVK549PlHRh8d/D0SBbxxn2XiM1Ml74qNJYvo80jAiMg70Ps0 xgpQ== 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=1Z8GPfWQG9JlhViWJSouPuAdwb1TR2JLNt392yI0Vq8=; b=hEh+MHG/hsxQ8tyXtQfkSy2IUtGM5HMbVjgTMemklQehO0Jacy/huxmGqECZRQiDVD cb6zl24PxdRva6hBHHNQyYVbCbiL/p93aBjc8mx0E29UsdwSEfNBs6WhnNEAUqDB13DF w8AVSBfUOzvvtHAWK6XWd1KJg3mFv7PXEyb8xw5y9i//D/OP0faa7yxsEuqTDff+frqS N6wKlJt79Vfl9IgLClp+rN5/0PtoW+0kp6q8AenLxF7k+Bpn7dDmZTAn6PY4k9VVFdXs 4te12P7ME89zXoyBz56A7LbtfS5hZ3F0WMG/9nij4SjwXNAwTEoTJdHDTus5wBvAWUoY pSiQ== X-Gm-Message-State: ANhLgQ27VBIqVjECmITkirr9RdDUOZpNUk/ezlvfWGErKvGgNs5RHzeT HwNpNkjP26n4QaS5mUzJOyEDnA== X-Received: by 2002:adf:cd03:: with SMTP id w3mr3365041wrm.191.1583316125356; Wed, 04 Mar 2020 02:02:05 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z13sm10959666wro.93.2020.03.04.02.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FC7C1FF91; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/9] tests/vm: give wait_ssh() option to wait for root Date: Wed, 4 Mar 2020 10:01:49 +0000 Message-Id: <20200304100154.14822-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::436 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 , Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Puhov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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> Message-Id: <20200303150622.20133-5-alex.bennee@linaro.org> -- 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 Wed Mar 4 10:01:50 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: 184164 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4707470ile; Wed, 4 Mar 2020 02:04:55 -0800 (PST) X-Google-Smtp-Source: ADFU+vsEX12alfXmyMbgVywabrLTzQBvc2xYCpvAt17XWv7PGe+GLaQ8c6FeprIoM5uzQEYf3bQu X-Received: by 2002:ac8:1e90:: with SMTP id c16mr1622365qtm.265.1583316295370; Wed, 04 Mar 2020 02:04:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316295; cv=none; d=google.com; s=arc-20160816; b=HXEBKysw5SMWYC9TuGKyGK1x0+jVpkxsbA9rx1Ge3ME6A4z5kGAOktuo514bS/++mm +narp2a6zcl+6PzeB83fiyXHc2j6wakjH8eLf2yo9myEuFakzmj2d13jjyzqK5OkxqLa GFquvyRFcDC248PTgpZfK2XyEy5qgbHpKeRvqsdYrCJU7epTnBXSdl/PUO75PrRNEcC6 q7E6SQyLOsXgRJW1dgGZr9Xh+DWlMJocXNLYAgrkn5Nu9n1ilFV/HVLe/zYQjEaDR5/x 3/E3WtEDTqUUqt0zMjy99zBUgoGvtBVPV4+R7ASFYB41YlbFbeDmCt9zyJ5oC3OsqVyn /o5w== 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=YDS2krmEOwHmyFHZND8chhdsDOBM1s0eAUxp7rCjnHk=; b=TEWEvNbqvf2fKxLjMmU9AQmv0TT2JDi270GcDU7ayi6CkCoWj//+/mrDZmBv2sZaMp 3ANKu5Bn9zRt8qXAim6YjzCtcxeGDaRhJBNx1q/97MOjl3gUmg8CF7p2aaRFJ3VFASuA MYIvbmMzi0Z09AYFww786xQcPBJ5QS+tk9XgA8WtfIThBUXBNrx7rchge4XiEyg4UR7W aoxW79SKzhAkPHR0+ECQEaFufXLY5A2BLoF1kYhA+p9BTZtgTDzjOtPd3MBTJhj+9yUE N3o7mHvEP+7hcW1FVlgppQoXCHATyiAx0j6S6HKT4wGOMUCKySAgC1YjDF97EEszzeQ4 dMzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gi7t4uiv; 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 k11si590000qkh.95.2020.03.04.02.04.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:04:55 -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=gi7t4uiv; 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]:60004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qta-0002ui-TT for patch@linaro.org; Wed, 04 Mar 2020 05:04:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41707) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqs-00070O-IZ for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqq-0000cd-Ps for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:06 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqq-0000aD-Da for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:04 -0500 Received: by mail-wm1-x329.google.com with SMTP id i9so1281265wml.4 for ; Wed, 04 Mar 2020 02:02:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YDS2krmEOwHmyFHZND8chhdsDOBM1s0eAUxp7rCjnHk=; b=gi7t4uivDk4XaBJ8/Opj2+UHYexHhEaaOtGLWu6aNoNxguNL1I1ctEGcq6mjuejGgZ LOMmNLKJ5FZ4TEN6cGCuePL/JGF4fztlQiMkie2j5ypabAEBCwgC77zLNX7hM4lRvFZ+ kro9bh1nfzVliF3f4AOf6ZkvpxM7QVCR4DdwX+yGxCwpsF7xkx4V16A4aSSEqb7/Doyj tp7trLm7M8Pi8J3ezazifJSMB9oBqfoaBF7ezVKLFPsXooKfhczg7h2iZ9BLysnKzxZ3 zelqTlCxGsg9zX5YMcrDWyoG1bwdW5jQXBHeYQUfXy49QSxivfX6/Mup1PaRh8MYlevd +RLA== 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=YDS2krmEOwHmyFHZND8chhdsDOBM1s0eAUxp7rCjnHk=; b=H2c1n87KnXGwDa8m6ueQCaGpU2BKex7mDCo+VW9QnGPQECxlvpFOlta7azioFoq1Xa /MZQtw1DCTFyBo0eAZWqewsNADjXXx7GNJK5+HxPm7j8EEfebBKNAomjXUwfx9H+8l78 PEKxNyHv3UW1zVBapxjkqrgZKO/SWZ/US+TnoaKoCj/ujduHFpP1OJyQHEaOnMVy6C1q z+Q46efGxwiSY0ee0rKtV5ywmGcGAxMB1WAwRqCYKjAEKAKfOZVJg2998gUsM6JwqqIK t4nnqHLDESW+TciIhnEjNpAi6QOjm0kRxe7BulCUtSuDIjl4sfM1m7ed/J4TU2nLfXvA nz1w== X-Gm-Message-State: ANhLgQ2GTp2qXY0VHaNPg7WPgrlkmXiw1aVDMVUVYyF248Yb4nKp8rOs p2ITu8nzHlJcTRR4/X4R9n2NcuaRmZs= X-Received: by 2002:a7b:cb03:: with SMTP id u3mr2811611wmj.41.1583316123360; Wed, 04 Mar 2020 02:02:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h16sm3318625wmd.10.2020.03.04.02.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 572AF1FF92; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/9] tests/vm: Added gen_cloud_init_iso() to basevm.py Date: Wed, 4 Mar 2020 10:01:50 +0000 Message-Id: <20200304100154.14822-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::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 Zheng , Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Puhov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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 Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200219163537.22098-6-robert.foley@linaro.org> Message-Id: <20200303150622.20133-6-alex.bennee@linaro.org> -- 2.20.1 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 Wed Mar 4 10:01:51 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: 184161 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4706730ile; Wed, 4 Mar 2020 02:04:09 -0800 (PST) X-Google-Smtp-Source: ADFU+vsJdxiuR/2PL7oa4LC/XpSWfLnSw1ZMDkvplbe/yTNBs3Vd5Ilvy84e68OEXb0+1E1k+CTT X-Received: by 2002:ac8:4d4b:: with SMTP id x11mr1606892qtv.171.1583316249708; Wed, 04 Mar 2020 02:04:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316249; cv=none; d=google.com; s=arc-20160816; b=LEvch38ZoQ/7nXEooKIMlnuwgYxkcs85ErXCvw/VNTZ2KpxR+079meHKAA36DuOtV1 pqJK50WR7ibZOVDIDe3kjT7OSIFqsm6pLFrwUzre0avgQeTtPZg9iiiJ+EQDnx6LJdzU tPvxI9UuoPiPjOWli5WGVIpRcuoDtvYy/Tv0c3OgMFq8jm4/dQE8cree0loJqcK5aQ5L cBiwkblP76q9TDzYXufBddu/gGG1olfI1XWMLtmHYvteu+JokanALYwlLkLmpfGnVZAk DQY57+IpFMZsThYThRmtb67p8UROy+gTJ/6LGsa+wqRt16G+canCMEHvMwT1Ft7CV57C i4XQ== 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=2ljA/K0enCk+cxQzY+NtXvus6XERwMgueLpDeNPRhYg=; b=R7t8vCCl939BObEzbVRXQJayEczNDXOkb0uIPBmFx7tf0mKIgnruTd49WUX50A9Se/ U1jf8Da/08hHKDXakrWvKGCP6dcTSEYIQPhA8sK30hAfWpS7136ZocFhxZYLOWy2y0vA YKILkXBBWNEe8nydkausXb5V9rgRP3jOSZemYhZFEWD/KzaY+bZ8IX9xlv70Tf2Nfhob 3q1uNYF/ZXEwjQEXlmyae/n0eU2JWzU/lT5WZr+6OUsJD2yq6BEkqXagliGuUyFrJeBs bR/tGusP/AyquKVPRW2EOUL3ecdvr3pLMEvy2Ad8HBZUCtrA4gjHGMg1GhQXSmlu2GyM 13fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nCQkguHH; 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 z12si634953qkz.257.2020.03.04.02.04.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:04: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=nCQkguHH; 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]:59990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qsr-00023F-8D for patch@linaro.org; Wed, 04 Mar 2020 05:04:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41660) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqp-000701-RL for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqo-0000Wd-PL for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:03 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:35858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqo-0000UJ-IT for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:02 -0500 Received: by mail-wm1-x332.google.com with SMTP id g83so1197668wme.1 for ; Wed, 04 Mar 2020 02:02:02 -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=2ljA/K0enCk+cxQzY+NtXvus6XERwMgueLpDeNPRhYg=; b=nCQkguHHdp1vCaeiq+brp8A84YpuA61FRDtY6ROEK5OKf+HsLZwBVzf8QCaOS18sVJ 4U4296VxFquoQA2wglpzQm/3SzIf/31tBi/H2BMVFGhq6nfHs4gd2CCjUQ0j5T/1UqM9 dwsTn1Ogo/XM7mg/F+NKLC5eGG0OzGJpIPSd0qTRW8Ggg2TjTUM+JBurSdB3WT3IpbxB w3qIBkxeZMsHKil87CV0TSwern3QXlaDj76OTMnnvsvg+RuYrI5a1huF2pIC7Hv7hsA2 WiupLmClKsBSoICo+QBrrhxIkI0BmWfpOuSN0uQfi7HyzXnuKCFe95mbtq2fg+VM9zXx EydQ== 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=2ljA/K0enCk+cxQzY+NtXvus6XERwMgueLpDeNPRhYg=; b=Kw9NqXCH81Z0fNp/qXX7OShGDzZG2RteeaT4A03P1eTkZXUCXPXU3Nz5TSo4zc7sHt 1iZ1x8iBvi/2rYkZTZ5jd+L8YJyAW17gPpTaE+eLD30i/Hi1QzDGmqyixvUZjPNJqqEJ GGC3ne55nmwPQBlWm9EYw/2RvKTroLlxr44IaPk/xKU9H59wyGKUG0AmcwcJQQYuimLI EMOr3BzKrQYXV2J2qSw9Y/aCi2GhwW2LBaJO2og5kT5pyFGNQ/QhMIxdLLs/UFVpCJXX 9rK7LZImDt6ffltjBM8iAAwBOHD32UojNKkRnQl0i19t2vNMmuZi2RyWF4LCkTtzkkQK 7DCA== X-Gm-Message-State: ANhLgQ2L/JPWS8kLH7GJlLqcOJbSxpbjt9IXfV8vH6R1ZOdmvUHuGxFU yWQIxF0BTc+FLcDfZll6qjKu8g== X-Received: by 2002:a7b:c5d9:: with SMTP id n25mr2999445wmk.65.1583316121560; Wed, 04 Mar 2020 02:02:01 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z10sm3323397wmk.31.2020.03.04.02.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B3CF1FF93; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/9] travis: enable tools build on OS X Date: Wed, 4 Mar 2020 10:01:51 +0000 Message-Id: <20200304100154.14822-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::332 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 , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20200302154630.45620-3-lvivier@redhat.com> Message-Id: <20200303150622.20133-7-alex.bennee@linaro.org> -- 2.20.1 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 Wed Mar 4 10:01:52 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: 184167 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4708671ile; Wed, 4 Mar 2020 02:06:14 -0800 (PST) X-Google-Smtp-Source: ADFU+vsWLGgfSqaYNyK+gUQCwLmmxgD2Y40dsuQpVKicsr8UnxDgQcV4zbcdiwWjTlfbBCloHrcr X-Received: by 2002:a05:6214:50e:: with SMTP id v14mr1446062qvw.219.1583316374245; Wed, 04 Mar 2020 02:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316374; cv=none; d=google.com; s=arc-20160816; b=ZKF1/o4BDJ7avkmllUX3sV8DvvZd4g+c2uPvbjgR3qsuQZa9DfUvFNjC5P/3iPMERh PaATBv4jXdUvgLD93nDfAjcYVRT1KiFBPbYIQjHaxL8QRnk+lakjcKC4rjbBGPSnXGp1 ngXDF4k+7Tak0jnEEQLBKc1FWI8RemHi/zOUgogqw57paQQfAMMP5C1pde4iA8LOBXjY lx8U75kL2b/BYp+J9DW6jqtTdhx6YIl6c3RbsN1RzRr21EMfAec34lJFnL7+HMrPEMPA +f8Qsjz51crNdQD6hBJPBGa+50vthPDjbWWJhwW3IQ71etr23xRDblWBBA93vGpRGE4j dx6g== 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=8IoRhGZ2eqfxiUMqD1IQ15ijzzrrTQ6InFUO0k6F5mQ=; b=duMhYdeHCDB+UBTC938PzZIcVBGof3piu+xZ9fUfhevJ2X8542qpLEx8Q49v+WxWoQ 02mTEICoC4WG+AzNXGT/J3eS0cT6oXemUYvGFJ8nLOA2IkulEZ3uDFwMAh3D1uYlhLMi ubjKYYacG/2X/ZQ3PHPt6/5+I3pU1efKxdxBqYEaeUo5xvA7+WpUcyiJhRtzgYQRqHKF +iAlfhE8/IIgmO5lK7Z6GjXDwtPRQZHl7IY3dd5T1WRBD9nsbacbhWYDx+jp89OaeoiW OL1D6EZnIh3UoLl/SNQw5HviPoIQKdZsNziz5iMA8/nRa57t3dmTnazg91kGQIYug/DU qTDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EneEo4fG; 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 g2si688561qtb.224.2020.03.04.02.06.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:06:14 -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=EneEo4fG; 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]:60052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qur-0005CD-OQ for patch@linaro.org; Wed, 04 Mar 2020 05:06:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41770) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqv-000722-FI for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqt-0000nh-K7 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:09 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41739) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqt-0000ky-D1 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:07 -0500 Received: by mail-wr1-x42d.google.com with SMTP id v4so1590811wrs.8 for ; Wed, 04 Mar 2020 02:02:07 -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=8IoRhGZ2eqfxiUMqD1IQ15ijzzrrTQ6InFUO0k6F5mQ=; b=EneEo4fGMDkOTBs22ZPqJkV3yB3aP3Dar/OaTM1KeR4fv+dhkcOnLzAC4MhDP8D0YO z2uZm/t3tQplRy9LrQvUbS2XXbGZPG0E69XLbnYfeuyBswjKiZEjoioHJIyQq/xygfv1 G2VXdKKKQP1o5Hi7ia9dRhN0ItdyAXSPTP7M+JbKyJHPCRKVVh6AzNwBX6Dn8Xo3sTlO JwaHnnIn1/Y5mTg0kr8uYLUPlzroJnaHqZu9u1CfyRLCma8TjFVDjX7siiMg4SLDZw1b Bp79kyPESbaQx+HMNl5PvAhaGs+KdFGVE0WU6ruv4LmQM0sJdrkuaX0izy1N2p/vmbW3 E3yA== 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=8IoRhGZ2eqfxiUMqD1IQ15ijzzrrTQ6InFUO0k6F5mQ=; b=PARHUXyva95PvEy9uwCMT2PA/Hq6dUAmqJUwaL9PsI4OyE3fGF1V9lNRg2w67qNXPt NUliGwjVnpZRyy07bTYSFnDW/3atcs2iCJ1CcQM2qAriG57SWma7civK1b2B+mOcVHWh qkIgzhK4mHqZR5zMMrfopvKtEkC4UnI94qT+8pQjZRqlAP6PNBRS+qLllDeqbpO3CvpC kg2DsWz5vrpGkBpHgOMtkEJS8hgCZuQ+DDADComZJbAw7QLOQuRx58TLSoFu17lm9UHW EcpbpZaHN3bJ2lMamuc4Pih0auklP7uC1MWLyl7AZcKSppdF/BRKVTtG+wbtNjI1w2bH iQ9g== X-Gm-Message-State: ANhLgQ3w0TQDm8DRPCKDha5dpBlWmty57qsltIxqR2jeKrJ6DhVuBgBZ 8iL3+fVVIYXZS5DEM/5/vwkhzQ== X-Received: by 2002:a5d:4d48:: with SMTP id a8mr3255313wru.35.1583316126338; Wed, 04 Mar 2020 02:02:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m3sm18662148wrx.9.2020.03.04.02.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 829231FF96; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/9] configure: detect and report genisoimage Date: Wed, 4 Mar 2020 10:01:52 +0000 Message-Id: <20200304100154.14822-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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 , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 Reviewed-by: Richard Henderson Message-Id: <20200303150622.20133-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 7b373bc0bb8..fab6281eb70 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 Wed Mar 4 10:01:53 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: 184165 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4708447ile; Wed, 4 Mar 2020 02:06:01 -0800 (PST) X-Google-Smtp-Source: ADFU+vvuCTggIWJqUH5Iap6FLZ24GUWY7et/cdxh3Inmw7hGWnLErT/sFjBl/Mh5hAw48Ke0IAzs X-Received: by 2002:ac8:4e93:: with SMTP id 19mr1613722qtp.32.1583316361326; Wed, 04 Mar 2020 02:06:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316361; cv=none; d=google.com; s=arc-20160816; b=m6HrNz9DZ/DxdSsFv7olKRmRyHfF/9zQZeHuSizpCpmtv1DJgeKROq7L9wG+yxD6p/ PiDmFkSiEtSih4tLE9XGswhVEkp4HHnYOxC3aocDe3gnAV+9/Zl3yRPdqW2Bv5/7lSsC 2dhQ/3vIB45zhI+OxqA6w01ABW9Kp26q6VyMXmAzv0CbG9PkipzVOhC3NiNpULmPko/G WpU5//CNhq6Zgu8m2PjAXf+mLDCkHsWUCM0lyp7hnudnVHmm0DM+Ex7J8qaopKgdzoeE gf3GaOWPhXRW+yjh3Qn3HKwauZMIdteHuvIFyoNWVch2/5+siZx1VirA2Fo/JLd2bC0I hnEA== 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=F+qeDvKSj+We27wUg+J0wmja2pZqof4r3cIb7B1val8=; b=ZQvIzeI/nv96aI3KTDgizgcIOXMiDY54qsXgu6EVcUn5xj1L5W4LZ/RAGFwDOohmxy D3KFfyZIkaf10nqtEADuILz8GeWZdHa1NK16x3teYKMSvZDIY7D6SZOwufp8JP/4xSYK CstaSHDeb4LOWUeYUYkoy4S0vAs/N83z+i7Y++VSmIn5OYy4JSK9saWAQUND1liaTiHa Q9pdHCcgRP7Z3BpE6d0JTYvCrqFn2lQbm5XVYa/O8zXo6z0LqZzvnTAlm3h1jCHMcOSn pkyJ/SIfIJoEK/7jvYvBv/04wyODwdOd5WhCT9vAYfdlQeVLZNqjakF7NdBqH9dIGl1u QCMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NHFBPzaT; 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 z2si668512qvm.45.2020.03.04.02.06.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:06:01 -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=NHFBPzaT; 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]:60042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Que-0004nP-QT for patch@linaro.org; Wed, 04 Mar 2020 05:06:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41811) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqx-00074U-Ps for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqs-0000jJ-FD for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:11 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:40151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqs-0000fQ-7n for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:06 -0500 Received: by mail-wm1-x333.google.com with SMTP id e26so1184551wme.5 for ; Wed, 04 Mar 2020 02:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F+qeDvKSj+We27wUg+J0wmja2pZqof4r3cIb7B1val8=; b=NHFBPzaTmHxruvrPcwNqfP5KmSfqAC4mnpGMA/Cr09jyyX+q/KY3aue07+8FuC/nTm x5xcnDd1Bbzc6A0cp8LmiBo6juzRQ+UlC+cGtLaOST2E10OC4Dtv7fhqilSjXnSgzVmr o28xxbIQbp9mbmi85d0jbtKOipiR7GAi+Js7zmdpo57R5GP4w402X9mOrGYQivuQbSlt DPNpCUWDXefedxVMf9R0fml/H/gpFkm+nIxbxoC+5VgBFIEhNGndrKh91RrLSpCuq10X HN7PDV1kXIqTOsf3eJ/WFzo5cs/LrmH7stiriqXoWTswr5Wf+O4ZxYYhzPDguvnSVUnR EHwg== 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=F+qeDvKSj+We27wUg+J0wmja2pZqof4r3cIb7B1val8=; b=JSCgsiKLsNHeVpAjFBWblk7xpJdG6up7XIN/Dlhe//0mBerm1CEQTu3mnpToErhXnG 0gqDj/j0b0pKC0pj80OUCDdNClsFRRUkN+cxwwivrSq4M92Uu3RBkdwbxq/YKarLqxtn 5jIIWL3ydzALV2UHlMhYrkm2Z3op8+/aLSLLVUcaXFd4JgMSrbH1z9hKPJclDaFLrlfT +aEldLvAR+gGJXZTozdcTk0tlFKOtzjR56CsDLvHsbYosSc/AI8gHe5C11KEbvlkcvYW 3HmI4/D5UzLKbEVcAohRHpFJ7hk8bvWGw9G6E09ukPxYy2+BsVMV9JPa78g5f0CMyupF +nBQ== X-Gm-Message-State: ANhLgQ2+ykclUKozHMGy1DFyWV3t6Q6PR71EYeyMpFlYZRrg06VPjz2a Vvg3Cmj24yO9j9jVECfXRyGJh49lc80= X-Received: by 2002:a7b:c74f:: with SMTP id w15mr2755402wmk.157.1583316124329; Wed, 04 Mar 2020 02:02:04 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j5sm3278583wmi.33.2020.03.04.02.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 982F91FF98; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 8/9] tests/acceptance: bump avocado requirements to 76.0 Date: Wed, 4 Mar 2020 10:01:53 +0000 Message-Id: <20200304100154.14822-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::333 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If we want to use @skipUnless decorations on the class we need a newer version of avocado. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200303150622.20133-9-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/requirements.txt b/tests/requirements.txt index a2a587223a9..f4f1736a086 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ # Add Python module requirements, one per line, to be installed # in the tests/venv Python virtual environment. For more info, # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 -avocado-framework==72.0 +avocado-framework==76.0 From patchwork Wed Mar 4 10:01:54 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: 184168 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4709996ile; Wed, 4 Mar 2020 02:07:40 -0800 (PST) X-Google-Smtp-Source: ADFU+vtwQR6Qm4DOEinSsnTx2f7OKM1Xa+ZZnFfFSXsvQMcyEh3Ur1BWClbPEK1x4ZVUg0YBA7Xm X-Received: by 2002:a37:6843:: with SMTP id d64mr2125039qkc.207.1583316460330; Wed, 04 Mar 2020 02:07:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316460; cv=none; d=google.com; s=arc-20160816; b=ecFIyAOPkFxBwD1X46frkQuiOxkv/Y9piRaygp6BusczGIRDzNPRx7FwcKqzO+nra9 0Hp2HnEKEYKjFa30JAHpRTGA5eQYImBKsnNTenHuwy6ojPSMpqrZiM/oDfy5PlQOXtdw NhDpgU82fJmkQNgu2PJXRMPBv1NkcdwmE9G79J96y8aVoNNRyZgQQDsjliSS35UQCO2n SQsKu3wCOX6bOMm0YMSbl5pNGvrS+vfAiy04rFSED0u84dgwDZeYO+wGVm/IeDhuPiIp XJttgwSiNRjbrxRJqzb+oEgE5brqalo1GRN1vbqUsKAFV1vf7TLjBCDmWyxPcwNiNBBm uLBw== 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=proYjuk/ghIUbAZUhjDs+u7cCfDIGKo4bJEFHg7+0GY=; b=P4OqdvGlAMyug8H67smQZH9gpu33t0LnJeWzV7/dpMWKUH1ZDOUVV+6n0OvtYI5k7X wyYZOivOPp6t8XxYsu2APFcQcS1M595bLs/51GmUVBMkOkJAHSXuVoefw8K2s12JBSaN 5vn1hJYBK9beX32TuyrWQuy0icLMOqjq9ro/aB7Dwo7z3TkycYJTzo0PQU2pDs6xQ4QN Z+j1VR14cRaDm8K53pS6rYzHxaSG36iSIsML2RPPNXTic8EzU2rhdWirxdk6P8xabulT 6DNmnpjLSYukNUrw6R74W0ZXnBrMlSz9enkQLs08KWcko6DCXdoE682HSuEDz32DqE0j ujuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UlMLB2+9; 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 j12si702043qtp.214.2020.03.04.02.07.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:07:40 -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=UlMLB2+9; 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]:60078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9QwF-0007rS-Tq for patch@linaro.org; Wed, 04 Mar 2020 05:07:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41792) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqw-00072v-Bq for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqv-0000u0-Cd for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:10 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqu-0000pq-KA for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:08 -0500 Received: by mail-wr1-x430.google.com with SMTP id y17so1599931wrn.6 for ; Wed, 04 Mar 2020 02:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=proYjuk/ghIUbAZUhjDs+u7cCfDIGKo4bJEFHg7+0GY=; b=UlMLB2+958dDHppmMIFuSMDcdYE8CJxzZipz6BbZnLsA13OXNJ0MHux6ChF9m+h4n+ suJ66b5kcZLPF5ANIbwE/YtTw6OqSpuStoIFc6X3laXSNWiJEJpzQH1tTFt8XVyl517y 8HGHttOWygrINcNclxWe+060kkmge5MTNmNxJutXfst4RdlZ2gBtyJNFiE7AWbHjot2s Vh9TtrUxkkvDrtMnF04LFxuVY5vdY5SknEP0nZCOgBH1Pz7u7FKj6E18sWKdDlGtlhpz Zizn0UU9J7wwTCSALP45egdL47KWFzPscxqI+CUPegPIGXGPRweeVLNs/4wI3wxIjv23 Znfg== 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=proYjuk/ghIUbAZUhjDs+u7cCfDIGKo4bJEFHg7+0GY=; b=NGA1lVyfUtO6a50X7qsWs6TWgVVPWk5GXa7etFFhia7pklvwQQSK77RwzM0jVL429D x99gcjwSmhf+XbkiktNkUO+6c4TjoNBfxKK8ChV06X+TS64UIgis0/8qIrlXnU0YiJf+ ppHOi/wf0sTdAlebP+nBTm8Utq73padjUpu2od3WyGXBpcZpMQC5rCqFZcrXnwXg4X/J g/Zn9up7bEem7VhfuubqrHKwR/X6WQ/xVR4qXSHo2advbu0oOHeCKMh0VhbYdzGrcLU2 f0KogXxhwLxgQZ6Ys9V1wIXWtBnNSWYpD23SbUBAsYCSvEKvuseWfpnvf7wzkhpdIJOR ZB8g== X-Gm-Message-State: ANhLgQ0BYHWWIlGnOFVzAls4I1z+y8fZjDewOmaZ4DaYhhgao/R6jeYb O0an5SlLX5AeTGOSSnnNsOiEQA== X-Received: by 2002:adf:dccb:: with SMTP id x11mr3278956wrm.214.1583316127568; Wed, 04 Mar 2020 02:02:07 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m3sm18662244wrx.9.2020.03.04.02.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD8EE1FF99; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 9/9] travis.yml: install python3 numpy and opencv libraries Date: Wed, 4 Mar 2020 10:01:54 +0000 Message-Id: <20200304100154.14822-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are used for the acceptance framebuffer tests to count Tux. As we need slightly newer python3 for opencv we bump up to bionic. Signed-off-by: Alex Bennée Message-Id: <20200303150622.20133-10-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 70a24bf2fc8..b92798ac3b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -313,6 +313,7 @@ jobs: # Acceptance (Functional) tests - name: "GCC check-acceptance" + dist: bionic env: - CONFIG="--target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu" - TEST_CMD="make check-acceptance" @@ -323,7 +324,9 @@ jobs: packages: - python3-pil - python3-pip - - python3.5-venv + - python3-numpy + - python3-opencv + - python3-venv - rpm2cpio - tesseract-ocr - tesseract-ocr-eng