[PATCH i-g-t v1] tests/intel/i915_test_config: align JSON documentation with xe

Mauro Carvalho Chehab mauro.chehab at linux.intel.com
Mon Feb 19 07:08:30 UTC 2024


On Fri, 16 Feb 2024 16:52:07 +0100
Kamil Konieczny <kamil.konieczny at linux.intel.com> wrote:

> From: Jari Tahvanainen <jari.tahvanainen at intel.com>
> 
> Restructure i915 JSON to align with Xe.
> 
> Cc: Mauro Carvalho Chehab <mauro.chehab at linux.intel.com>
> Cc: Mauro Carvalho Chehab <mchehab at kernel.org>
> Signed-off-by: Jari Tahvanainen <jari.tahvanainen at intel.com>
> Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> ---
>  tests/intel/i915_test_config.json | 45 ++++++++++++++++++++++---------
>  1 file changed, 32 insertions(+), 13 deletions(-)
> 
> diff --git a/tests/intel/i915_test_config.json b/tests/intel/i915_test_config.json
> index ad59677f8..b09f4244e 100644
> --- a/tests/intel/i915_test_config.json
> +++ b/tests/intel/i915_test_config.json
> @@ -16,33 +16,52 @@
>      "exclude_files": [ "kms_*", "gem_concurrent_all.c", "gem_concurrent_blit.c",
>                         "xe_*" ],
>      "fields": {
> -	"Mega feature": {
> +        "Category": {
> +            "_properties_": {
> +                "mandatory": true,
> +                "description": "Contains the major group for the tested functionality, being hardware, software or firmware"
> +            },
> +            "Mega feature": {
>                  "_properties_": {
>                      "description": "Contains the mega feature for end to end use case, e. g. the 'sellable' feature."
>                  },
> -                "Category": {
> -                "_properties_": {
> -                    "description": "Contains the major group for the tested functionality"
> -                },
> -
>                  "Sub-category": {
>                      "_properties_": {
> -                        "description": "Contains the minor group of the functionality"
> +                        "mandatory": true,
> +                        "description": "Contains the technical feature/functionality"
>                      },
>                      "Functionality": {
>                          "_properties_": {
> -                            "description": "Describes the functionality to be tested"
> +                            "mandatory": true,
> +                            "description": "Groups page table tests on buckets containg more detailed functionality"
>                          },
>                          "Feature": {
>                              "_properties_": {
>                                  "description": "Describes the lowest level feature bucket"
> -                            },
> -                            "Run type": {
> -                                "_properties_": {
> -                                    "description": "Defines what category of testlist it belongs"
> -                                }
>                              }
>                          }
> +                    },
> +                    "Run type": {
> +                        "_properties_": {
> +                            "mandatory": true,
> +                            "description": "Defines what category of testlist it belongs",
> +                            "default-testlist": "FULL",
> +                            "update-from-file": {
> +                                "exclude-type": "regex-ignorecase",
> +                                "append-value-if-not-excluded": "i915 FULL",
> +                                "include": [
> +                                    { "i915 BAT": "../intel-ci/fast-feedback.testlist" }
> +                                ],
> +                                "exclude": [
> +                                    { "i915 BAT, 915 FULL": "../intel-ci/blacklist.txt" }

There is a typo at "915 FULL". It should be, instead: 

	{ "i915 BAT, i915 FULL": "../intel-ci/blacklist.txt" }

or, even better:

	{ "all": "../intel-ci/blacklist.txt" }

With that:

Reviewed-by: Mauro Carvalho Chehab <mchehab at kernel.org>


> +                                ]
> +                            },
> +                            "order": [
> +                                "boot",
> +                                "__all__",
> +                                "kunit"
> +                            ]
> +                        }
>                      }
>                  }
>              }


More information about the igt-dev mailing list