diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2018-04-17 16:58:54 +0300 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2018-04-19 11:57:02 +0300 |
| commit | 8168bb65d5e64d4df4e5d847d448bab2d2825d73 (patch) | |
| tree | 2960f4f4389b7229108c48bdc659976c553e2476 /tests/meson.build | |
| parent | 9a41ace714a6fd4275b05097b12d1b6a7f8653af (diff) | |
meson: Install amdgpu tests with their subdirectory
The amdgpu tests in tests/amdgpu got installed directly into
$libexecdir before, but test-list.txt still referred to them as
amdgpu/$testname.
This fixes running scripts/run-tests.sh -l with the install directory
as IGT_TEST_ROOT and, I can imagine, actually running them from
install directory (untested). It also removes one FIXME comment for an
internet point.
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
Diffstat (limited to 'tests/meson.build')
| -rw-r--r-- | tests/meson.build | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/meson.build b/tests/meson.build index 4720dfe2..015afa47 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -223,16 +223,6 @@ test_progs = [ test_deps = [ igt_deps ] -if libdrm_amdgpu.found() - # FIXME meson/ninja really doesn't like build targets with paths in them - test_progs += [ - 'amdgpu/amd_basic', - 'amdgpu/amd_cs_nop', - 'amdgpu/amd_prime', - ] - test_deps += libdrm_amdgpu -endif - if libdrm_nouveau.found() test_progs += [ 'prime_nv_api', @@ -309,6 +299,8 @@ executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'], install : true) test_progs += 'testdisplay' +subdir('amdgpu') + gen_testlist = find_program('generate_testlist.sh') test_list = custom_target('testlist', output : 'test-list.txt', |