diff options
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/Makefile.sources | 2 | ||||
| -rwxr-xr-x | tests/generate_testlist.sh | 9 | ||||
| -rw-r--r-- | tests/meson.build | 20 |
4 files changed, 22 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c70f6f1..39ca3960 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ TESTS_progs += \ $(NULL) endif +TESTS_progs += testdisplay if BUILD_TESTS test-list.txt: Makefile.sources diff --git a/tests/Makefile.sources b/tests/Makefile.sources index cf542df1..0adc28a0 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -282,8 +282,6 @@ testdisplay_SOURCES = \ testdisplay_hotplug.c \ $(NULL) -TESTS_progs += testdisplay - check_SCRIPTS = igt_command_line.sh \ $(NULL) diff --git a/tests/generate_testlist.sh b/tests/generate_testlist.sh index a0d53e9f..87637fc8 100755 --- a/tests/generate_testlist.sh +++ b/tests/generate_testlist.sh @@ -5,9 +5,14 @@ shift echo TESTLIST > $OUTPUT +if [[ $# -gt 0 ]] ; then + echo -n $1 >> $OUTPUT + shift +fi + while [[ $# -gt 0 ]] ; do - echo $1 >> $OUTPUT + echo -n " $1" >> $OUTPUT shift done -echo END TESTLIST >> $OUTPUT +echo -e "\nEND TESTLIST" >> $OUTPUT diff --git a/tests/meson.build b/tests/meson.build index 919ee50b..1c619179 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -218,6 +218,17 @@ 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', @@ -238,14 +249,11 @@ if libdrm_vc4.found() test_deps += libdrm_vc4 endif -if libdrm_amdgpu.found() - # FIXME meson/ninja really doesn't like build targets with paths in them +if chamelium.found() test_progs += [ - 'amdgpu/amd_basic', - 'amdgpu/amd_cs_nop', - 'amdgpu/amd_prime', + 'chamelium', ] - test_deps += libdrm_amdgpu + test_deps += chamelium endif if alsa.found() and gsl.found() |