From patchwork Thu May 9 16:59:05 2019 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: 163730 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1246700ilr; Thu, 9 May 2019 10:07:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5/qqNIUiOAhqqJjITLT0RZP1oDH1ce4P0H41OYK7tU8E1ya5GSzgwXfrAEmDYGuZymbTr X-Received: by 2002:a1c:cc18:: with SMTP id h24mr3653203wmb.13.1557421651710; Thu, 09 May 2019 10:07:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557421651; cv=none; d=google.com; s=arc-20160816; b=v1RhyYxVDKlxhYiNpRUkOsJpti/y5rYIsDdtC+FYX+r3qTNv4SCuKfKWMnkO8CAtZ/ 4Fvd7NLQgKPPJdykkXb3oeuN+E/YUlPnAVdqhieJRSYX8D303AgZKS2F+lzkD7QihODg mKkGbnNYTtavfN+R8YORWVdYObzqctwWBzoaIH3poLK9Qo9iHhooNhGTv/PvOHNmMak0 Iv4jRZI0n9LAD/ZidjcPB9m7ugj6FR6tqNSg5WCHInDeUESCsejVE4zXfZT6BrbeICY/ ZPeOXzAaYujWT6LaY4z+VW1mbhcKdNhq/IGpCksFWRAYe9BDHS1DgunilZsovtENwuq5 k6hQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=BruQFJSmyR8ZsEhlY42Yrz/6o7DH3AvksulnhVRaQWU=; b=axbUJBPcT2C0IBwQA2E046u8e5i8cCJLaM4XjW1uCDIHoe2AqrQ5XerUbPmBM8P+i2 foqGLvfvkCeESZFjN+rdgDLDlyGxO0zse4zz4Ui6UOP1ufDu4C8fjFaSKvDfAMa8dQoJ 7rsp+y91fSfzOrKAIeUCWjQj0aEfrQnnc92SjYruqiUjU1ibq5rl9t3i9T21C390DVey okSC/TY2YFICJxeqc+mXAodgyszbWNWOXN78dyxOBDs6gfDla1v9sFlny5j/r78cXy55 AYHCIeemGe6z19JwgxE+Eo8eoCHsv7H+Jc7l4Hpe/ql4EA23qJQE72plzIxhGmk06+Oj dT/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aXYaB+vk; 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 z142si2015863wmc.9.2019.05.09.10.07.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 10:07:31 -0700 (PDT) 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=aXYaB+vk; 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 ([127.0.0.1]:58095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmW2-0005YY-Hj for patch@linaro.org; Thu, 09 May 2019 13:07:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOmOE-00075n-2z for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOmOD-0004xl-0C for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:26 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOmOC-0004xD-Nn for qemu-devel@nongnu.org; Thu, 09 May 2019 12:59:24 -0400 Received: by mail-wr1-x42d.google.com with SMTP id s15so4009522wra.12 for ; Thu, 09 May 2019 09:59:24 -0700 (PDT) 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=BruQFJSmyR8ZsEhlY42Yrz/6o7DH3AvksulnhVRaQWU=; b=aXYaB+vktXvYqhzIAlcqMSfT3UIKylD4W5gN16cnli8OURj0OJJyRmSor8Sj9emZX5 bClYOyiRXpv4dUFnGmrIroJuV4hRkk5tJN3OY3NxYdQyoT7l76jgjZl4apJ2uF2Zbmp8 /xB6CXqlYcNb3EUo4VeTMoPeckhJzCRIGRpgO1wE+6ThS4KCjMZ2jBfPxY/wXtE8YNjJ vRvUhtXq01KtB7VsiKqaUW+g4ihnuxNfFMMlzOAwfYCuojcYQxBO8NFmDvwa+OJhzNoE b0iI1eUb9iiuW3C1iOzSKgGwl/KtVItZgoOeXLQHOG8idI6gmw51qmiCyzrdnGYTnHoC 0uTw== 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=BruQFJSmyR8ZsEhlY42Yrz/6o7DH3AvksulnhVRaQWU=; b=KbR7CRBELovGbD7mEn8H89pBBFquURuMJIywabjj4s6d20/hhEfIVJmDNHF2HnuG7e 6Lgk9zIaoDgj+6g48Ml95HF9WA95odMQ5tOhkSfVr1wVOiJgKZj36CYhzrTgh3hQkApG Wv+bzrOeh5KTZnNHsZ57vU4LlJnPJEcV/cEcXN/WAbo3v83ilxXiWon5ZqlwjsTytWr7 V0zJJg8W/xHCkpcA5l6jeQBU4xHQQlvcMCUmmAfetvVo+z1RUguGirsiqKkCvJIjKF1K C0i2XxqkSwc+kxxkU7E08drgdVRu9++5/mWjrQJp8ZPQDOrhxLfoVGkKGw/aPLtNr1Sl hX7g== X-Gm-Message-State: APjAAAWzIpTXxinAq89+T3ApsVYM/GDDZRyzPga24ijV1UrgNahIjqB7 MkVBCtoi5ArAYy0XNgQTaVcERQ== X-Received: by 2002:a5d:458e:: with SMTP id p14mr4043359wrq.318.1557421163682; Thu, 09 May 2019 09:59:23 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z17sm3625846wrm.33.2019.05.09.09.59.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 May 2019 09:59:22 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7423D1FF87; Thu, 9 May 2019 17:59:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 17:59:05 +0100 Message-Id: <20190509165912.10512-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190509165912.10512-1-alex.bennee@linaro.org> References: <20190509165912.10512-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 Subject: [Qemu-devel] [PATCH v1 17/23] tests/qemu-iotests/check: Pick a default machine if necessary X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Max Reitz , Christian Borntraeger , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have a default machine, so when running the qemu-iotests with such a binary, lots of tests are failing. Fix it by picking a default machine in the "check" script instead. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Christian Borntraeger Signed-off-by: Thomas Huth Message-Id: <20190502084506.8009-3-thuth@redhat.com> Signed-off-by: Alex Bennée --- tests/qemu-iotests/check | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index f9c24b6753c..922c5d1d3d3 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -130,7 +130,6 @@ export CACHEMODE="writeback" export QEMU_IO_OPTIONS="" export QEMU_IO_OPTIONS_NO_FMT="" export CACHEMODE_IS_DEFAULT=true -export QEMU_OPTIONS="-nodefaults -machine accel=qtest" export VALGRIND_QEMU= export IMGKEYSECRET= export IMGOPTSSYNTAX=false @@ -564,6 +563,18 @@ then fi export QEMU_PROG="$(type -p "$QEMU_PROG")" +case "$QEMU_PROG" in + *qemu-system-arm|*qemu-system-aarch64) + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest" + ;; + *qemu-system-tricore) + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest" + ;; + *) + export QEMU_OPTIONS="-nodefaults -machine accel=qtest" + ;; +esac + if [ -z "$QEMU_IMG_PROG" ]; then if [ -x "$build_iotests/qemu-img" ]; then export QEMU_IMG_PROG="$build_iotests/qemu-img"