[PATCH i-g-t v2 3/3] tests: Remove Sub-category duplicates after introducing Category=Core

[Katarzyna Piecielska]

We do not want to have the same name for Category and Sub-category or any
other collision in documented fields. After I unified Category field for Core
tests there are some duplicated names in Category and Sub-category.
Let's remove them.
When doing that change I find few tests that do not have Mega feature defined.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska at intel.com>
Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Cc: Gandi Ramadevi <ramadevi.gandi at intel.com>
Cc: Aditya Chauhan <aditya.chauhan at intel.com>
Cc: Girotra Himanshu <himanshu.girotra at intel.com>
---
 tests/dmabuf_sync_file.c    | 3 ++-
 tests/drm_read.c            | 3 ++-
 tests/intel/i915_pciid.c    | 2 +-
 tests/intel/i915_selftest.c | 8 ++++----
 tests/prime_vgem.c          | 2 +-
 tests/syncobj_eventfd.c     | 7 ++++---
 tests/vgem_basic.c          | 2 +-
 tests/vgem_slow.c           | 2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tests/dmabuf_sync_file.c b/tests/dmabuf_sync_file.c
index ba33f6a9d..ca9d7d579 100644
--- a/tests/dmabuf_sync_file.c
+++ b/tests/dmabuf_sync_file.c
@@ -13,9 +13,10 @@ IGT_TEST_DESCRIPTION("Tests for sync_file support in dma-buf");
 /**
  * TEST: dmabuf_sync_file
  * Category: Core
+ * Mega feature: General Core features
+ * Sub-category: dmabuf
  * Description: Tests for sync_file support in dma-buf
  * Functionality: dmabuf test
- * Sub-category: Core
  *
  * SUBTEST: export-basic
  * SUBTEST: export-before-signal
diff --git a/tests/drm_read.c b/tests/drm_read.c
index a7f0d8702..0a9b61cd0 100644
--- a/tests/drm_read.c
+++ b/tests/drm_read.c
@@ -54,8 +54,9 @@ IGT_TEST_DESCRIPTION("Call read(drm) and see if it behaves.");
  * TEST: drm read
  * Description: boundary testing of read(drm_fd)
  * Category: Core
- * Functionality: drm_mm
+ * Mega feature: General Core features
  * Sub-category: uapi
+ * Functionality: drm_mm
  *
  * SUBTEST: invalid-buffer
  * SUBTEST: fault-buffer
diff --git a/tests/intel/i915_pciid.c b/tests/intel/i915_pciid.c
index 42ed7151d..a8c5df9d9 100644
--- a/tests/intel/i915_pciid.c
+++ b/tests/intel/i915_pciid.c
@@ -33,7 +33,7 @@
  * Description: Check that igt/i915 know about this PCI-ID
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: driver
  * Functionality: device management
  * Feature: core
  * Test category: GEM_Legacy
diff --git a/tests/intel/i915_selftest.c b/tests/intel/i915_selftest.c
index f234ca2de..aa29eb36a 100644
--- a/tests/intel/i915_selftest.c
+++ b/tests/intel/i915_selftest.c
@@ -310,7 +310,7 @@
  * Description: Validation of per-object locking patterns
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: CMD submission
  * Functionality: per-object locking
  * Test category: i915
  *
@@ -318,7 +318,7 @@
  * Description: User object allocation and isolation checks
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: CMD submission
  * Functionality: objects
  * Test category: i915
  *
@@ -357,7 +357,7 @@
  * Description: Checks the selftest infrastructure itself
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: driver
  * Functionality: sanitycheck
  * Test category: i915
  *
@@ -531,7 +531,7 @@
  * Description: Selftest for the selftest
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: driver
  * Functionality: sanitycheck
  * Test category: i915
  *
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 79ea12b5c..932058d2c 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -35,7 +35,7 @@
  * Description: Basic check of polling for prime/vgem fences.
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: DRM
  * Functionality: mock device
  * Feature: prime
  * Test category: GEM_Legacy
diff --git a/tests/syncobj_eventfd.c b/tests/syncobj_eventfd.c
index a4a73f251..f8bf17e1f 100644
--- a/tests/syncobj_eventfd.c
+++ b/tests/syncobj_eventfd.c
@@ -13,11 +13,12 @@
 
 /**
  * TEST: syncobj eventfd
- * Category: Core
  * Description: Tests for the drm sync object eventfd API
- * Feature: synchronization
- * Functionality: semaphore
+ * Category: Core
+ * Mega feature: General Core features
  * Sub-category: DRM
+ * Functionality: semaphore
+ * Feature: synchronization
  * Test category: GEM_Legacy
  */
 
diff --git a/tests/vgem_basic.c b/tests/vgem_basic.c
index f30722bbe..048ad7460 100644
--- a/tests/vgem_basic.c
+++ b/tests/vgem_basic.c
@@ -36,7 +36,7 @@
  * Description: Basic sanity check of Virtual GEM module (vGEM).
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: DRM
  * Functionality: mock device
  * Test category: GEM_Legacy
  * Feature: vgem
diff --git a/tests/vgem_slow.c b/tests/vgem_slow.c
index 3ce0f811e..6609989c7 100644
--- a/tests/vgem_slow.c
+++ b/tests/vgem_slow.c
@@ -35,7 +35,7 @@
  * Description: Extended sanity check of Virtual GEM module (vGEM).
  * Category: Core
  * Mega feature: General Core features
- * Sub-category: Core
+ * Sub-category: DRM
  * Functionality: mock device
  * Feature: vgem
  * Test category: GEM_Legacy
-- 
2.34.1