Skip to contentSkip to conversation

Cleanup indentation on Intel JSON files

PATCH In review Mauro Carvalho Chehab 2 participants 5 messages Apr 25, 2024

lore
Share & tools
lore
#0 lore raw

cover Cleanup indentation on Intel JSON files

From: Mauro Carvalho Chehab <[email protected]>

Having an uniform notation at the JSON files is a good thing, as it makes easier to maintain it.

Ensure that all 3 Intel JSON test plan config files are using the same notation by running:

   cat tests/intel/xe_test_config.json |jq --indent 4 >a && mv a tests/intel/xe_test_config.json
   cat tests/intel/kms_test_config.json |jq --indent 4 >a && mv a tests/intel/kms_test_config.json
   cat tests/intel/i915_test_config.json |jq --indent 4 >a && mv a tests/intel/i915_test_config.json

And then verifying the results, committing the changes that are worth and ensuring that all 3 files will follow the same style.

Mauro Carvalho Chehab (2):
tests/intel/kms_test_config.json: fix indentation tests/intel/*.json: remove some uneeded whitespaces

 tests/intel/i915_test_config.json | 4 ++--
 tests/intel/kms_test_config.json  | 8 ++++----
 tests/intel/xe_test_config.json   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.44.0
#1 lore raw

PATCH 1/2 tests/intel/kms_test_config.json: fix indentation

From: Mauro Carvalho Chehab <[email protected]>

There are some wrong indentation at Run Type. Fix it.

No functional changes.

---
 tests/intel/kms_test_config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tests/intel/kms_test_config.json +3 -3
index 7c37c831b72c..5c8db82dfc73 100644
@@ -23,9 +23,9 @@
                     "exclude": [
                         { "i915 BAT, i915 BAT chamelium, i915 chamelium, i915 FULL": "../intel-ci/blacklist.txt" },
                             { "Xe BAT, Xe BAT chamelium, Xe FULL": "../intel-ci/xe.blocklist.txt" }
-                        ]
-                    }
-                },
+                    ]
+                }
+            },
             "Category": {
                 "_properties_": {
                     "description": "Contains the major group for the tested functionality 'Display'"
Signature · 1 line
2.44.0
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH i-g-t 1/2] tests/intel/kms_test_config.json: fix indentation

Hi Mauro,

Quoted 7 lines · Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

There are some wrong indentation at Run Type. Fix it.

No functional changes.

Quoted 24 lines
---
 tests/intel/kms_test_config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tests/intel/kms_test_config.json +3 -3
index 7c37c831b72c..5c8db82dfc73 100644
@@ -23,9 +23,9 @@
                     "exclude": [
                         { "i915 BAT, i915 BAT chamelium, i915 chamelium, i915 FULL": "../intel-ci/blacklist.txt" },
                             { "Xe BAT, Xe BAT chamelium, Xe FULL": "../intel-ci/xe.blocklist.txt" }
-                        ]
-                    }
-                },
+                    ]
+                }
+            },
             "Category": {
                 "_properties_": {
                     "description": "Contains the major group for the tested functionality 'Display'"
Signature · 1 line
2.44.0
#3 lore raw

PATCH 2/2 tests/intel/*.json: remove some uneeded whitespaces

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

To make the file more uniform, remove some extra whitespaces after a couple of field names at those files.

---
 tests/intel/i915_test_config.json | 4 ++--
 tests/intel/kms_test_config.json  | 2 +-
 tests/intel/xe_test_config.json   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
tests/intel/i915_test_config.json +2 -2
index f51ae2a55bdd..26e47215248d 100644
@@ -91,7 +91,7 @@
                 "description": "Describes any GPU-specific requrirement, like requiring multi-tiles."
             }
         },
-        "Depends on" : {
+        "Depends on": {
             "_properties_": {
                 "description": "List other subtests that are required to not be skipped before calling this one."
             }
@@ -101,7 +101,7 @@
                 "description": "Point to known missing features at the test or subtest."
             }
         },
-        "Description" : {
+        "Description": {
             "_properties_": {
                 "description": "Provides a description for the test/subtest."
             }
tests/intel/kms_test_config.json +1 -1
index 5c8db82dfc73..bca3b250fffb 100644
@@ -52,7 +52,7 @@
                 "description": "Defines the test category. Usually used at subtest level."
             }
         },
-        "Description" : {
+        "Description": {
             "_properties_": {
                 "description": "Provides a description for the test/subtest."
             }
tests/intel/xe_test_config.json +2 -2
index f8888341475a..3775e63fc65e 100644
@@ -79,7 +79,7 @@
                 "description": "Describes any GPU-specific requrirement, like requiring multi-tiles."
             }
         },
-        "Depends on" : {
+        "Depends on": {
             "_properties_": {
                 "description": "List other subtests that are required to not be skipped before calling this one."
             }
@@ -89,7 +89,7 @@
                 "description": "Point to known missing features at the test or subtest."
             }
         },
-        "Description" : {
+        "Description": {
             "_properties_": {
                 "mandatory": true,
                 "description": "Provides a description for the test/subtest."
Signature · 1 line
2.44.0
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH i-g-t 2/2] tests/intel/*.json: remove some uneeded whitespaces

Hi Mauro,

Quoted 6 lines · Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

To make the file more uniform, remove some extra whitespaces after a couple of field names at those files.

Quoted 66 lines
---
 tests/intel/i915_test_config.json | 4 ++--
 tests/intel/kms_test_config.json  | 2 +-
 tests/intel/xe_test_config.json   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
tests/intel/i915_test_config.json +2 -2
index f51ae2a55bdd..26e47215248d 100644
@@ -91,7 +91,7 @@
                 "description": "Describes any GPU-specific requrirement, like requiring multi-tiles."
             }
         },
-        "Depends on" : {
+        "Depends on": {
             "_properties_": {
                 "description": "List other subtests that are required to not be skipped before calling this one."
             }
@@ -101,7 +101,7 @@
                 "description": "Point to known missing features at the test or subtest."
             }
         },
-        "Description" : {
+        "Description": {
             "_properties_": {
                 "description": "Provides a description for the test/subtest."
             }
tests/intel/kms_test_config.json +1 -1
index 5c8db82dfc73..bca3b250fffb 100644
@@ -52,7 +52,7 @@
                 "description": "Defines the test category. Usually used at subtest level."
             }
         },
-        "Description" : {
+        "Description": {
             "_properties_": {
                 "description": "Provides a description for the test/subtest."
             }
tests/intel/xe_test_config.json +2 -2
index f8888341475a..3775e63fc65e 100644
@@ -79,7 +79,7 @@
                 "description": "Describes any GPU-specific requrirement, like requiring multi-tiles."
             }
         },
-        "Depends on" : {
+        "Depends on": {
             "_properties_": {
                 "description": "List other subtests that are required to not be skipped before calling this one."
             }
@@ -89,7 +89,7 @@
                 "description": "Point to known missing features at the test or subtest."
             }
         },
-        "Description" : {
+        "Description": {
             "_properties_": {
                 "mandatory": true,
                 "description": "Provides a description for the test/subtest."
Signature · 1 line
2.44.0