diff options
author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-10-25 16:44:36 +0300 |
---|---|---|
committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-11-16 13:34:41 +0200 |
commit | 8ac5cfb4db9c7bc593beec18a6be1e2ff163106c (patch) | |
tree | d8fb22aa5e4185af11e95e62a1fbe1a2636a6aac | |
parent | 422fea093734b7eca0707e24458ed9ba89f37dcb (diff) |
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>
-rw-r--r-- | docs/reference/igt-gpu-tools/Makefile.am | 4 | ||||
-rw-r--r-- | docs/reference/igt-gpu-tools/igt_test_programs.xml | 18 | ||||
-rw-r--r-- | docs/reference/igt-gpu-tools/meson.build | 2 | ||||
-rw-r--r-- | tests/Makefile.sources | 23 | ||||
-rw-r--r-- | tests/feat_profile.json | 10 | ||||
-rw-r--r-- | tests/i915/getparams_basic.c (renamed from tests/drv_getparams_basic.c) | 0 | ||||
-rw-r--r-- | tests/i915/hangman.c (renamed from tests/drv_hangman.c) | 0 | ||||
-rw-r--r-- | tests/i915/missed_irq.c (renamed from tests/drv_missed_irq.c) | 0 | ||||
-rw-r--r-- | tests/i915/module_load.c (renamed from tests/drv_module_reload.c) | 6 | ||||
-rw-r--r-- | tests/i915/selftest.c (renamed from tests/drv_selftest.c) | 0 | ||||
-rw-r--r-- | tests/i915/suspend.c (renamed from tests/drv_suspend.c) | 0 | ||||
-rwxr-xr-x | tests/igt_command_line.sh | 2 | ||||
-rw-r--r-- | tests/intel-ci/blacklist.txt | 4 | ||||
-rw-r--r-- | tests/intel-ci/fast-feedback.testlist | 12 | ||||
-rw-r--r-- | tests/meson.build | 12 |
15 files changed, 52 insertions, 41 deletions
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 d007ebc7..5620c1d6 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 \ @@ -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 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 index 7cb210df..7cb210df 100644 --- a/tests/drv_getparams_basic.c +++ b/tests/i915/getparams_basic.c diff --git a/tests/drv_hangman.c b/tests/i915/hangman.c index 6ddae491..6ddae491 100644 --- a/tests/drv_hangman.c +++ b/tests/i915/hangman.c diff --git a/tests/drv_missed_irq.c b/tests/i915/missed_irq.c index 78690c36..78690c36 100644 --- a/tests/drv_missed_irq.c +++ b/tests/i915/missed_irq.c diff --git a/tests/drv_module_reload.c b/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 index 80e515c6..80e515c6 100644 --- a/tests/drv_selftest.c +++ b/tests/i915/selftest.c diff --git a/tests/drv_suspend.c b/tests/i915/suspend.c index 84cb3b49..84cb3b49 100644 --- a/tests/drv_suspend.c +++ b/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@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 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@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 diff --git a/tests/meson.build b/tests/meson.build index 3020f798..52f91a22 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', @@ -98,7 +92,13 @@ test_progs = [ ] i915_progs = [ + 'getparams_basic', + 'hangman', + 'missed_irq', + 'module_load', 'query', + 'selftest', + 'suspend', ] gem_progs = [ |