From 8ac5cfb4db9c7bc593beec18a6be1e2ff163106c Mon Sep 17 00:00:00 2001
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Date: Thu, 25 Oct 2018 16:44:36 +0300
Subject: tests: Move drv_ tests to i915 directory

The drv_ tests are i915 specific, so let's move them to i915 directory
and change the binary prefix to i915_.

Additionally, while we at moving stuff around, let's rename
module_reload to module_load and do the following cleanup with the
subtests:

  basic-reload        -> reload
  basic-no-display    -> reload-no-display
  basic-reload-inject -> reload-with-fault-injection

Cc: Martin Peres <martin.peres@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Martin Peres <martin.peres@linux.intel.com>
---
 docs/reference/igt-gpu-tools/Makefile.am           |  4 ++--
 docs/reference/igt-gpu-tools/igt_test_programs.xml | 18 +++++++++---------
 docs/reference/igt-gpu-tools/meson.build           |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'docs')

diff --git a/docs/reference/igt-gpu-tools/Makefile.am b/docs/reference/igt-gpu-tools/Makefile.am
index 11ada326..c77c6a65 100644
--- a/docs/reference/igt-gpu-tools/Makefile.am
+++ b/docs/reference/igt-gpu-tools/Makefile.am
@@ -144,8 +144,6 @@ test_program_files = xml/igt_test_programs_amdgpu_description.xml \
 		     xml/igt_test_programs_debugfs_programs.xml \
 		     xml/igt_test_programs_drm_description.xml \
 		     xml/igt_test_programs_drm_programs.xml \
-		     xml/igt_test_programs_drv_description.xml \
-		     xml/igt_test_programs_drv_programs.xml \
 		     xml/igt_test_programs_gem_description.xml \
 		     xml/igt_test_programs_gem_programs.xml \
 		     xml/igt_test_programs_gen3_description.xml \
@@ -154,6 +152,8 @@ test_program_files = xml/igt_test_programs_amdgpu_description.xml \
 		     xml/igt_test_programs_gen7_programs.xml \
 		     xml/igt_test_programs_gvt_description.xml \
 		     xml/igt_test_programs_gvt_programs.xml \
+		     xml/igt_test_programs_i915_description.xml \
+		     xml/igt_test_programs_i915_programs.xml \
 		     xml/igt_test_programs_kms_description.xml \
 		     xml/igt_test_programs_kms_programs.xml \
 		     xml/igt_test_programs_meta_description.xml \
diff --git a/docs/reference/igt-gpu-tools/igt_test_programs.xml b/docs/reference/igt-gpu-tools/igt_test_programs.xml
index 95c4653e..2487da79 100644
--- a/docs/reference/igt-gpu-tools/igt_test_programs.xml
+++ b/docs/reference/igt-gpu-tools/igt_test_programs.xml
@@ -145,15 +145,6 @@
     <xi:include href="igt_test_programs_drm_description.xml"/>
   </refentry>
 
-  <refentry id="igt-drv-tests">
-    <refnamediv>
-      <refname>DRV Tests</refname>
-      <refpurpose>Tests for overall driver behaviour</refpurpose>
-    </refnamediv>
-    <xi:include href="igt_test_programs_drv_programs.xml"/>
-    <xi:include href="igt_test_programs_drv_description.xml"/>
-  </refentry>
-
   <refentry id="igt-gem-tests">
     <refnamediv>
       <refname>GEM Tests</refname>
@@ -190,6 +181,15 @@
     <xi:include href="igt_test_programs_gvt_description.xml"/>
   </refentry>
 
+  <refentry id="igt-i915-tests">
+    <refnamediv>
+      <refname>i915 Tests</refname>
+      <refpurpose>Tests for overall i915 driver behaviour</refpurpose>
+    </refnamediv>
+    <xi:include href="igt_test_programs_i915_programs.xml"/>
+    <xi:include href="igt_test_programs_i915_description.xml"/>
+  </refentry>
+
   <refentry id="igt-kms-tests">
     <refnamediv>
       <refname>KMS Tests</refname>
diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index e544e71b..b2b2c1c2 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -29,11 +29,11 @@ test_groups = [
 	'core',
 	'debugfs',
 	'drm',
-	'drv',
 	'gem',
 	'gen3',
 	'gen7',
 	'gvt',
+	'i915',
 	'kms',
 	'meta',
 	'perf',
-- 
cgit v1.2.3