[igt-dev] [PATCH i-g-t 1/3] tests: Rename drv_module_reload to i915_load

[Arkadiusz Hiler]

On Wed, Oct 17, 2018 at 01:34:00PM +0100, Chris Wilson wrote:
> Quoting Arkadiusz Hiler (2018-10-17 13:15:43)
> > The test is i915 specific, so let's be clear on that. There is also more
> > subtests coming that are not just reloading.
> 
> It's still focussed on module_load, so I would want to keep module in
> there so it's clearly nothing to do with runtime loads (workloads).

k

> And adding a 'i915' is a good time to start a i915/

I guess it still makes sense to have the binaries in a single directory,
both in build dir and libexec, just prefixed with the folder name.

With meson that's quite easy:

--------------------------------------------------
diff --git a/tests/meson.build b/tests/meson.build
index 41cc18c8..d4442ffc 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,5 +1,4 @@
 test_progs = [
-  'i915_load_module',
   'core_auth',
   'core_get_client_auth',
   'core_getclient',
@@ -215,6 +214,10 @@ test_progs = [
   'vgem_slow',
 ]

+i915_progs = [
+  'load_module',
+]
+
 test_deps = [ igt_deps ]

 if libdrm_nouveau.found()
@@ -250,6 +253,14 @@ foreach prog : test_progs
         install : true)
 endforeach

+foreach prog : i915_progs
+  test_executables += executable('i915_' + prog, join_paths('i915', prog + '.c'),
+        dependencies : test_deps,
+        install_dir : libexecdir,
+        install_rpath : libexecdir_rpathdir,
+        install : true)
+endforeach
+
 test_executables += executable('gem_eio', 'gem_eio.c',
      dependencies : test_deps + [ realtime ],
      install_dir : libexecdir,
--------------------------------------------------

We need to figure how to do something similar with autotools.

... unless there is a different preference, that also won't make
Martin/Tomi miserable.

> > Cc: Martin Peres <martin.peres at linux.intel.com>
> > Cc: Petri Latvala <petri.latvala at intel.com>
> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
> > ---
> >  tests/Makefile.sources                     | 2 +-
> >  tests/{drv_module_reload.c => i915_load.c} | 0
> >  tests/intel-ci/blacklist.txt               | 2 +-
> >  tests/intel-ci/fast-feedback.testlist      | 6 +++---
> >  tests/meson.build                          | 2 +-
> >  5 files changed, 6 insertions(+), 6 deletions(-)
> >  rename tests/{drv_module_reload.c => i915_load.c} (100%)
> > 
> > diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> > index cdf5a7e1..a1fa6e98 100644
> > --- a/tests/Makefile.sources
> > +++ b/tests/Makefile.sources
> > @@ -22,6 +22,7 @@ AMDGPU_TESTS = \
> >         $(NULL)
> >  
> >  TESTS_progs = \
> > +       i915_load \
> 
> 'i' is after 'c'
> -Chris

I am constantly bad with alphabet, but wow...

I think this time it was my brain ignoring the letter and treating this
as a numeral.
-Arek