summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorVignesh Raman <vignesh.raman@collabora.com>2024-05-02 12:13:09 +0530
committerKamil Konieczny <kamil.konieczny@linux.intel.com>2024-05-06 16:03:36 +0200
commit1cf83083f855894dd287d9cf84bbcc2952b52d02 (patch)
tree7451a191d15349ef2b1473cb644b015245471678 /tests
parent7fbab9beb12cfb0aa8e35e3dec285eede8fdc67a (diff)
tests/meson.build: Generate test-list for cross build
test-list.txt and test-list-full.txt are not generated for cross-builds and they are required by drm-ci for testing. Commit 485bcb98182d ("tests/meson.build: only generate testlists on native builds") disables generating .testlist files for cross-builds since the binaries cannot be executed but test-list.txt and test-list-full.txt generation shouldn't require that. So generate them for cross-builds. Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/meson.build26
1 files changed, 10 insertions, 16 deletions
diff --git a/tests/meson.build b/tests/meson.build
index 65b8bf23b..758ae090c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -468,15 +468,11 @@ subdir('vc4')
subdir('vmwgfx')
gen_testlist = find_program('generate_testlist.sh')
-if not meson.is_cross_build()
- test_list_target = custom_target('testlist',
- output : 'test-list.txt',
- command : [ gen_testlist, '@OUTPUT@', test_list ],
- install : true,
- install_dir : libexecdir)
-else
- test_list_target = []
-endif
+test_list_target = custom_target('testlist',
+ output : 'test-list.txt',
+ command : [ gen_testlist, '@OUTPUT@', test_list ],
+ install : true,
+ install_dir : libexecdir)
test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
dependencies : test_deps + [ libatomic ],
@@ -485,13 +481,11 @@ test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c
install : true)
test_list += 'gem_concurrent_all'
-if not meson.is_cross_build()
- test_list_full_target = custom_target('testlist-full',
- output : 'test-list-full.txt',
- command : [ gen_testlist, '@OUTPUT@', test_list ],
- install : true,
- install_dir : libexecdir)
-endif
+test_list_full_target = custom_target('testlist-full',
+ output : 'test-list-full.txt',
+ command : [ gen_testlist, '@OUTPUT@', test_list ],
+ install : true,
+ install_dir : libexecdir)
test_script = find_program('igt_command_line.sh')
foreach prog : test_list