diff options
| -rw-r--r-- | tests/amdgpu/meson.build | 19 | ||||
| -rw-r--r-- | tests/meson.build | 12 |
2 files changed, 21 insertions, 10 deletions
diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build new file mode 100644 index 00000000..af5e74c7 --- /dev/null +++ b/tests/amdgpu/meson.build @@ -0,0 +1,19 @@ + +amdgpu_progs = [] +amdgpu_deps = test_deps +if libdrm_amdgpu.found() + amdgpu_progs += [ 'amd_basic', + 'amd_cs_nop', + 'amd_prime', + ] + amdgpu_deps += libdrm_amdgpu +endif + +foreach prog : amdgpu_progs + test_executables += executable(prog, prog + '.c', + dependencies : amdgpu_deps, + install_dir : join_paths(libexecdir, 'amdgpu'), + install_rpath : rpathdir, + install : true) + test_progs += join_paths('amdgpu', prog) +endforeach 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', |