diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-09-08 17:14:47 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-09-20 19:25:58 +0300 |
| commit | fd5aa6aac2dba154689c5350280d4cba9284eee5 (patch) | |
| tree | 1de1ec2c1e14b12b6c3ddd710a0dd7fcdab5764c | |
| parent | 1043c09ccbcba8e5c2ec5f2a358a442346348bd8 (diff) | |
meson: align test-list.txt generation with automake
- I forgot the chamelium tests
- Order tests the same way in both build systems. Since testdisplay is
special, it's easier to put that at the end in meson, so adjusted
automake to suit.
With this you can diff the 2 test lists and end up with 0 differences,
which will be useful to CI meson vs. automake.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
| -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() |