Received: by 2002:adf:e804:0:0:0:0:0 with SMTP id o4csp4055238wrm; Mon, 7 Oct 2019 10:07:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKGoA7rqbETcy6TcJgRLTj3kQUNp40mmmzu+3GJVBLtr/uJ6uuKcAnMu3GNz1W58Rgh4vm X-Received: by 2002:a17:906:8c8:: with SMTP id o8mr25196806eje.56.1570468028126; Mon, 07 Oct 2019 10:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570468028; cv=none; d=google.com; s=arc-20160816; b=BanXZbQrQmrvxWUJQaUD5gWYLVlwlYXvOIFIp7aZTTJctwjWwdK2V9NvtBCcyiZl/4 OSrcLrOTO+Od88XP0on5jDjzmjMjHBXTc0b20NDDEuRIfGKIi8it+1MPhmGwMSOLBucc t7ymzk5690nmx2Mke3eeRBoXqQqrFIE/P8j/3NDFoelw3Lz7WL02cggYHwRnxy1vI5qt MosMaGGvMcPBkcSbZVbPZ7esyuA88VIqXMnCvZowQVrGCTooscCbyezEgOPOozhhza28 h5praDgLLFkoqTWC6QueyqJWuauK9SSqHqobu2KnUnU599GL5kfQPiHM9Ash5CtfqDWs B73w== 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; bh=OdHacEIWSF/2zTal5cic3lzuYQuJHS07vdSHU/gNiKY=; b=ZbxCcLtNVw3UvRy1cerpLs7eMLAvzKYJmCwdQgSRkttTwURqxMhpiq9rMe62gk4j3O hv8ggcrKi2Ql4DFke9SRVHcwx6y8ESVbmXbcxHcN4IsGtS4T2DDwNvuhfedI7KfkAgEo dUFrTUbop7DDNV40s8ffP35qe8c4WfyIsLX2ZhzCowterPkR3I7aXenlrNJmI5F+CoRx tTjZFUUp8vWz/JDdcvh41sSXlqfMIAbWdoOy49Z+ZyxGcEsY31e516LGgXt9HDGV3aFb DgfG+awSU4CIqhHbXl6oWfZZeHuUZ7QykjE2/lSXUQ046VZvtq9o9Q4jFdHd1o9etiDs +CrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h18si7215427ejx.68.2019.10.07.10.07.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Oct 2019 10:07:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHWTS-0006hZ-7g for alex.bennee@linaro.org; Mon, 07 Oct 2019 13:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36888) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHWSz-0006HE-M0 for qemu-arm@nongnu.org; Mon, 07 Oct 2019 13:06:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHWSy-0004qP-A0 for qemu-arm@nongnu.org; Mon, 07 Oct 2019 13:06:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47802) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iHWSx-0004pu-KH; Mon, 07 Oct 2019 13:06:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0BC710C050B; Mon, 7 Oct 2019 17:06:34 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.43.2.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77FF65D9C9; Mon, 7 Oct 2019 17:06:33 +0000 (UTC) From: Andrew Jones To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Subject: [RFC PATCH 4/5] tests/arm-cpu-features: Check feature default values Date: Mon, 7 Oct 2019 19:06:21 +0200 Message-Id: <20191007170622.1814-5-drjones@redhat.com> In-Reply-To: <20191007170622.1814-1-drjones@redhat.com> References: <20191007170622.1814-1-drjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Mon, 07 Oct 2019 17:06:34 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, bijan.mottahedeh@oracle.com, maz@kernel.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: bfD+lCRTAJQR If we know what the default value should be then we can test for that as well as the feature existence. Signed-off-by: Andrew Jones --- tests/arm-cpu-features.c | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/tests/arm-cpu-features.c b/tests/arm-cpu-features.c index 92668efb8f56..ee444b04010f 100644 --- a/tests/arm-cpu-features.c +++ b/tests/arm-cpu-features.c @@ -141,6 +141,32 @@ static bool resp_get_feature(QDict *resp, const char= *feature) qobject_unref(_resp); \ }) =20 +#define assert_has_feature_enabled(qts, cpu_type, feature) \ +({ \ + QDict *_resp, *_props; \ + \ + _resp =3D do_query_no_props(qts, cpu_type); = \ + g_assert(_resp); \ + g_assert(resp_has_props(_resp)); \ + _props =3D resp_get_props(_resp); = \ + g_assert(qdict_get(_props, feature)); \ + g_assert(qdict_get_bool(_props, feature)); \ + qobject_unref(_resp); \ +}) + +#define assert_has_feature_disabled(qts, cpu_type, feature) \ +({ \ + QDict *_resp, *_props; \ + \ + _resp =3D do_query_no_props(qts, cpu_type); = \ + g_assert(_resp); \ + g_assert(resp_has_props(_resp)); \ + _props =3D resp_get_props(_resp); = \ + g_assert(qdict_get(_props, feature)); \ + g_assert(!qdict_get_bool(_props, feature)); \ + qobject_unref(_resp); \ +}) + static void assert_type_full(QTestState *qts) { const char *error; @@ -387,16 +413,16 @@ static void test_query_cpu_model_expansion(const vo= id *data) assert_error(qts, "host", "The CPU type 'host' requires KVM", NULL); =20 /* Test expected feature presence/absence for some cpu types */ - assert_has_feature(qts, "max", "pmu"); - assert_has_feature(qts, "cortex-a15", "pmu"); + assert_has_feature_enabled(qts, "max", "pmu"); + assert_has_feature_enabled(qts, "cortex-a15", "pmu"); assert_has_not_feature(qts, "cortex-a15", "aarch64"); =20 if (g_str_equal(qtest_get_arch(), "aarch64")) { - assert_has_feature(qts, "max", "aarch64"); - assert_has_feature(qts, "max", "sve"); - assert_has_feature(qts, "max", "sve128"); - assert_has_feature(qts, "cortex-a57", "pmu"); - assert_has_feature(qts, "cortex-a57", "aarch64"); + assert_has_feature_enabled(qts, "max", "aarch64"); + assert_has_feature_enabled(qts, "max", "sve"); + assert_has_feature_enabled(qts, "max", "sve128"); + assert_has_feature_enabled(qts, "cortex-a57", "pmu"); + assert_has_feature_enabled(qts, "cortex-a57", "aarch64"); =20 sve_tests_default(qts, "max"); =20 @@ -417,7 +443,7 @@ static void test_query_cpu_model_expansion_kvm(const = void *data) =20 qts =3D qtest_init(MACHINE "-accel kvm -cpu host"); =20 - assert_has_feature(qts, "host", "pmu"); + assert_has_feature_enabled(qts, "host", "pmu"); =20 if (g_str_equal(qtest_get_arch(), "aarch64")) { bool kvm_supports_sve; @@ -427,7 +453,7 @@ static void test_query_cpu_model_expansion_kvm(const = void *data) QDict *resp; char *error; =20 - assert_has_feature(qts, "host", "aarch64"); + assert_has_feature_enabled(qts, "host", "aarch64"); =20 assert_error(qts, "cortex-a15", "We cannot guarantee the CPU type 'cortex-a15' works " --=20 2.20.1