Commit 789a35ef authored by Andrew Jones's avatar Andrew Jones Committed by Peter Maydell
Browse files

tests/arm-cpu-features: Check feature default values 



If we know what the default value should be then we can test for
that as well as the feature existence.

Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20200120101023.16030-5-drjones@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 65caa415

tests/qtest/arm-cpu-features.c

+28 −9
Original line number Diff line number Diff line
@@ -159,6 +159,25 @@ static bool resp_get_feature(QDict *resp, const char *feature) 
    qobject_unref(_resp);                                              \

})



#define assert_feature(qts, cpu_type, feature, expected_value)         \

({                                                                     \

    QDict *_resp, *_props;                                             \

                                                                       \

    _resp = do_query_no_props(qts, cpu_type);                          \

    g_assert(_resp);                                                   \

    g_assert(resp_has_props(_resp));                                   \

    _props = resp_get_props(_resp);                                    \

    g_assert(qdict_get(_props, feature));                              \

    g_assert(qdict_get_bool(_props, feature) == (expected_value));     \

    qobject_unref(_resp);                                              \

})



#define assert_has_feature_enabled(qts, cpu_type, feature)             \

    assert_feature(qts, cpu_type, feature, true)



#define assert_has_feature_disabled(qts, cpu_type, feature)            \

    assert_feature(qts, cpu_type, feature, false)



static void assert_type_full(QTestState *qts)

{

    const char *error;
@@ -405,16 +424,16 @@ static void test_query_cpu_model_expansion(const void *data) 
    assert_error(qts, "host", "The CPU type 'host' requires KVM", NULL);



    /* 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");



    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");



        sve_tests_default(qts, "max");
@@ -451,8 +470,8 @@ static void test_query_cpu_model_expansion_kvm(const void *data) 
        QDict *resp;

        char *error;



        assert_has_feature(qts, "host", "aarch64");

        assert_has_feature(qts, "host", "pmu");

        assert_has_feature_enabled(qts, "host", "aarch64");

        assert_has_feature_enabled(qts, "host", "pmu");



        assert_error(qts, "cortex-a15",

            "We cannot guarantee the CPU type 'cortex-a15' works "