summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-03 11:33:36 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-03 13:59:54 +0200
commitd5cac49cca0a48a5531b6d59f3b6b716dffa3786 (patch)
tree5cbc7b35ba600db2dc77b69dfd64416de68801ec /tests
parent8d4ddaee1371ef4f027466031cc5dd0d65593651 (diff)
tests/drv_module_reload: Fix running single tests
We always need to make sure there's a working driver, hence need to move the -final test into the igt_fixture. This was broken in the conversion from the simple shell script (which didn't have any subtests) in commit 2fea8d26e589a9d256eca9f3d561750ecb3fb681 Author: Marius Vlad <marius.c.vlad@intel.com> Date: Thu Dec 1 14:23:57 2016 +0200 tests/drv_module_reload: Convert sh script to C version. Cc: tomi.p.sarvela@intel.com Tested-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/drv_module_reload.c6
-rw-r--r--tests/intel-ci/fast-feedback.testlist1
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c
index be831851..e812e5ec 100644
--- a/tests/drv_module_reload.c
+++ b/tests/drv_module_reload.c
@@ -329,14 +329,12 @@ igt_main
}
}
- igt_subtest("basic-reload-final") {
+ igt_fixture {
if ((err = reload(NULL)))
igt_fail(err);
gem_sanitycheck();
gem_exec_store();
- }
-
- igt_fixture
hda_dynamic_debug(false);
+ }
}
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index c1aa373d..02a222f2 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -283,5 +283,4 @@ 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@drv_module_reload@basic-reload-final
igt@gvt_basic@invalid-placeholder-test