Message ID | 20170803093659.5768-1-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Aug 03, 2017 at 11:36:59AM +0200, Daniel Vetter wrote: > 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 > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Tested-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c index be831851dec2..e812e5ec9fbc 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 c1aa373d596d..02a222f2fe64 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
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 Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- tests/drv_module_reload.c | 6 ++---- tests/intel-ci/fast-feedback.testlist | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)