From: Vignesh Raman <vignesh.raman@collabora.com>
To: igt-dev@lists.freedesktop.org
Subject: [PATCH i-g-t v1] tests/meson.build: Generate test-list for cross build
Date: Thu, 2 May 2024 12:13:09 +0530 [thread overview]
Message-ID: <20240502064309.56280-1-vignesh.raman@collabora.com> (raw)
test-list.txt and test-list-full.txt are not generated for
cross-builds, and they are required by drm-ci for testing.
Commit 485bcb98 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>
---
tests/meson.build | 26 ++++++++++----------------
1 file 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
--
2.40.1
next reply other threads:[~2024-05-02 6:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 6:43 Vignesh Raman [this message]
2024-05-02 9:32 ` ✗ CI.xeBAT: failure for tests/meson.build: Generate test-list for cross build Patchwork
2024-05-06 12:59 ` Kamil Konieczny
2024-05-02 9:45 ` ✗ Fi.CI.BAT: " Patchwork
2024-05-06 13:01 ` Kamil Konieczny
2024-05-02 10:46 ` ✗ CI.xeFULL: " Patchwork
2024-05-06 13:21 ` Kamil Konieczny
2024-05-06 12:56 ` [PATCH i-g-t v1] " Kamil Konieczny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240502064309.56280-1-vignesh.raman@collabora.com \
--to=vignesh.raman@collabora.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox