Commit 8ac5cfb4 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler

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's avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: 's avatarMartin Peres <martin.peres@linux.intel.com>
parent 422fea09
Pipeline #8793 failed with stages
in 74 minutes and 16 seconds
......@@ -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 \
......
......@@ -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>
......
......@@ -29,11 +29,11 @@ test_groups = [
'core',
'debugfs',
'drm',
'drv',
'gem',
'gen3',
'gen7',
'gvt',
'i915',
'kms',
'meta',
'perf',
......
......@@ -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 \
......@@ -479,9 +473,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
......
......@@ -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" : "",
......
......@@ -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();
......
......@@ -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
......
......@@ -2,7 +2,7 @@ igt@meta_test(@.*)?
###############################################
# Kernel selftests (run separately)
###############################################
igt@drv_selftest(@.*)?
igt@i915_selftest(@.*)?
igt@drm_mm(@.*)?
###############################################
# Handle module reloads with great care!
......@@ -12,7 +12,7 @@ igt@drm_mm(@.*)?
# self-contained tests, leading to random
# failures in tests run afterwards.
###############################################
igt@drv_module_reload(@.*)?
igt@i915_module_load(@.*)?
igt@pm_rpm@module-reload
###############################################
# GEM
......
......@@ -3,9 +3,6 @@
igt@core_auth@basic-auth
igt@core_prop_blob@basic
igt@debugfs_test@read_all_entries
igt@drv_getparams_basic@basic-eu-total
igt@drv_getparams_basic@basic-subslice-total
igt@drv_hangman@error-state-basic
igt@gem_basic@bad-close
igt@gem_basic@create-close
igt@gem_basic@create-fd-close
......@@ -139,6 +136,9 @@ igt@gem_wait@basic-busy-all
igt@gem_wait@basic-wait-all
igt@gem_wait@basic-await-all
igt@gem_workarounds@basic-read
igt@i915_getparams_basic@basic-eu-total
igt@i915_getparams_basic@basic-subslice-total
igt@i915_hangman@error-state-basic
igt@kms_addfb_basic@addfb25-bad-modifier
igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling
igt@kms_addfb_basic@addfb25-modifier-no-flag
......@@ -269,7 +269,7 @@ igt@vgem_basic@sysfs
# driver in a broken state that is not otherwise noticed in that test.
igt@vgem_basic@unload
igt@drv_module_reload@basic-reload
igt@drv_module_reload@basic-no-display
igt@drv_module_reload@basic-reload-inject
igt@i915_module_load@reload
igt@i915_module_load@reload-no-display
igt@i915_module_load@reload-with-fault-injection
igt@pm_rpm@module-reload
......@@ -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',
......@@ -98,7 +92,13 @@ test_progs = [
]
i915_progs = [
'getparams_basic',
'hangman',
'missed_irq',
'module_load',
'query',
'selftest',
'suspend',
]
gem_progs = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment