[igt-dev] [PATCH i-g-t v2] tests: Move drv_ tests to i915 directory
Arkadiusz Hiler
arkadiusz.hiler at intel.com
Thu Oct 25 13:44:36 UTC 2018
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 at linux.intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala at intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
---
docs/reference/igt-gpu-tools/Makefile.am | 4 ++--
.../igt-gpu-tools/igt_test_programs.xml | 18 +++++++--------
docs/reference/igt-gpu-tools/meson.build | 2 +-
tests/Makefile.sources | 23 ++++++++++++++-----
tests/feat_profile.json | 10 ++++----
.../getparams_basic.c} | 0
tests/{drv_hangman.c => i915/hangman.c} | 0
tests/{drv_missed_irq.c => i915/missed_irq.c} | 0
.../module_load.c} | 6 ++---
tests/{drv_selftest.c => i915/selftest.c} | 0
tests/{drv_suspend.c => i915/suspend.c} | 0
tests/igt_command_line.sh | 2 +-
tests/intel-ci/blacklist.txt | 4 ++--
tests/intel-ci/fast-feedback.testlist | 12 +++++-----
tests/meson.build | 12 +++++-----
15 files changed, 52 insertions(+), 41 deletions(-)
rename tests/{drv_getparams_basic.c => i915/getparams_basic.c} (100%)
rename tests/{drv_hangman.c => i915/hangman.c} (100%)
rename tests/{drv_missed_irq.c => i915/missed_irq.c} (100%)
rename tests/{drv_module_reload.c => i915/module_load.c} (98%)
rename tests/{drv_selftest.c => i915/selftest.c} (100%)
rename tests/{drv_suspend.c => i915/suspend.c} (100%)
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',
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index c910210b..a652641e 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -33,12 +33,6 @@ TESTS_progs = \
drm_import_export \
drm_mm \
drm_read \
- drv_getparams_basic \
- drv_hangman \
- drv_missed_irq \
- drv_module_reload \
- drv_selftest \
- drv_suspend \
kms_3d \
kms_addfb_basic \
kms_atomic \
@@ -477,9 +471,26 @@ gen3_render_tiledx_blits_SOURCES = i915/gen3_render_tiledx_blits.c
TESTS_progs += gen3_render_tiledy_blits
gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
+TESTS_progs += i915_getparams_basic
+i915_getparams_basic_SOURCES = i915/getparams_basic.c
+
+TESTS_progs += i915_hangman
+i915_hangman_SOURCES = i915/hangman.c
+
+TESTS_progs += i915_missed_irq
+i915_missed_irq_SOURCES = i915/missed_irq.c
+
+TESTS_progs += i915_module_load
+i915_module_load_SOURCES = i915/module_load.c
+
TESTS_progs += i915_query
i915_query_SOURCES = i915/query.c
+TESTS_progs += i915_selftest
+i915_selftest_SOURCES = i915/selftest.c
+
+TESTS_progs += i915_suspend
+i915_suspend_SOURCES = i915/suspend.c
TESTS_progs_X = gem_concurrent_all
gem_concurrent_all_SOURCES = i915/gem_concurrent_all.c
diff --git a/tests/feat_profile.json b/tests/feat_profile.json
index ccc2ad86..f13d636e 100644
--- a/tests/feat_profile.json
+++ b/tests/feat_profile.json
@@ -24,11 +24,6 @@
"exclude_tests" : "",
"target_rate" : 90
},
- "drv" : {
- "include_tests" : "drv",
- "exclude_tests" : "",
- "target_rate" : 90
- },
"gem" : {
"include_tests" : "gem",
"exclude_tests" : "",
@@ -40,6 +35,11 @@
"exclude_tests" : "",
"target_rate" : 90
},
+ "i915" : {
+ "include_tests" : "i915",
+ "exclude_tests" : "",
+ "target_rate" : 90
+ },
"kms" : {
"include_tests" : "kms",
"exclude_tests" : "",
diff --git a/tests/drv_getparams_basic.c b/tests/i915/getparams_basic.c
similarity index 100%
rename from tests/drv_getparams_basic.c
rename to tests/i915/getparams_basic.c
diff --git a/tests/drv_hangman.c b/tests/i915/hangman.c
similarity index 100%
rename from tests/drv_hangman.c
rename to tests/i915/hangman.c
diff --git a/tests/drv_missed_irq.c b/tests/i915/missed_irq.c
similarity index 100%
rename from tests/drv_missed_irq.c
rename to tests/i915/missed_irq.c
diff --git a/tests/drv_module_reload.c b/tests/i915/module_load.c
similarity index 98%
rename from tests/drv_module_reload.c
rename to tests/i915/module_load.c
index cf4aea80..7fe83520 100644
--- a/tests/drv_module_reload.c
+++ b/tests/i915/module_load.c
@@ -326,7 +326,7 @@ hda_dynamic_debug(bool enable)
igt_main
{
- igt_subtest("basic-reload") {
+ igt_subtest("reload") {
int load_error;
igt_i915_driver_unload();
@@ -343,7 +343,7 @@ igt_main
/* only default modparams, can leave module loaded */
}
- igt_subtest("basic-no-display") {
+ igt_subtest("reload-no-display") {
igt_i915_driver_unload();
igt_assert_eq(igt_i915_driver_load("disable_display=1"), 0);
@@ -351,7 +351,7 @@ igt_main
igt_i915_driver_unload();
}
- igt_subtest("basic-reload-inject") {
+ igt_subtest("reload-with-fault-injection") {
int i = 0;
igt_i915_driver_unload();
diff --git a/tests/drv_selftest.c b/tests/i915/selftest.c
similarity index 100%
rename from tests/drv_selftest.c
rename to tests/i915/selftest.c
diff --git a/tests/drv_suspend.c b/tests/i915/suspend.c
similarity index 100%
rename from tests/drv_suspend.c
rename to tests/i915/suspend.c
diff --git a/tests/igt_command_line.sh b/tests/igt_command_line.sh
index a4ec3f95..e05ec34c 100755
--- a/tests/igt_command_line.sh
+++ b/tests/igt_command_line.sh
@@ -90,7 +90,7 @@ check_test ()
# Subtest enumeration of kernel selftest launchers depends
# on the running kernel. If selftests are not enabled,
# they will output nothing and exit with 0.
- if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" -a "$testname" != "kms_selftest" ]; then
+ if [ "$testname" != "i915_selftest" -a "$testname" != "drm_mm" -a "$testname" != "kms_selftest" ]; then
fail $test
fi
fi
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 88b2fe31..77f0c905 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt
@@ -2,7 +2,7 @@ igt at meta_test(@.*)?
###############################################
# Kernel selftests (run separately)
###############################################
-igt at drv_selftest(@.*)?
+igt at i915_selftest(@.*)?
igt at drm_mm(@.*)?
###############################################
# Handle module reloads with great care!
@@ -12,7 +12,7 @@ igt at drm_mm(@.*)?
# self-contained tests, leading to random
# failures in tests run afterwards.
###############################################
-igt at drv_module_reload(@.*)?
+igt at i915_module_load(@.*)?
igt at pm_rpm@module-reload
###############################################
# GEM
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index c625904d..6d42792c 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -3,9 +3,6 @@
igt at core_auth@basic-auth
igt at core_prop_blob@basic
igt at debugfs_test@read_all_entries
-igt at drv_getparams_basic@basic-eu-total
-igt at drv_getparams_basic@basic-subslice-total
-igt at drv_hangman@error-state-basic
igt at gem_basic@bad-close
igt at gem_basic@create-close
igt at gem_basic@create-fd-close
@@ -139,6 +136,9 @@ igt at gem_wait@basic-busy-all
igt at gem_wait@basic-wait-all
igt at gem_wait@basic-await-all
igt at gem_workarounds@basic-read
+igt at i915_getparams_basic@basic-eu-total
+igt at i915_getparams_basic@basic-subslice-total
+igt at i915_hangman@error-state-basic
igt at kms_addfb_basic@addfb25-bad-modifier
igt at kms_addfb_basic@addfb25-framebuffer-vs-set-tiling
igt at kms_addfb_basic@addfb25-modifier-no-flag
@@ -269,7 +269,7 @@ igt at vgem_basic@sysfs
# driver in a broken state that is not otherwise noticed in that test.
igt at vgem_basic@unload
-igt at drv_module_reload@basic-reload
-igt at drv_module_reload@basic-no-display
-igt at drv_module_reload@basic-reload-inject
+igt at i915_module_load@reload
+igt at i915_module_load@reload-no-display
+igt at i915_module_load@reload-with-fault-injection
igt at pm_rpm@module-reload
diff --git a/tests/meson.build b/tests/meson.build
index eacdc1a7..d5586930 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -10,12 +10,6 @@ test_progs = [
'drm_import_export',
'drm_mm',
'drm_read',
- 'drv_getparams_basic',
- 'drv_hangman',
- 'drv_missed_irq',
- 'drv_module_reload',
- 'drv_selftest',
- 'drv_suspend',
'kms_3d',
'kms_addfb_basic',
'kms_atomic',
@@ -96,7 +90,13 @@ test_progs = [
]
i915_progs = [
+ 'getparams_basic',
+ 'hangman',
+ 'missed_irq',
+ 'module_load',
'query',
+ 'selftest',
+ 'suspend',
]
gem_progs = [
--
2.17.2
More information about the igt-dev
mailing list