From: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Ilja Friedel <ihf@google.com>
Subject: [igt-dev] [PATCH i-g-t] tests/meson.build: only generate testlists on native builds
Date: Fri, 1 Sep 2023 09:42:24 +0200 [thread overview]
Message-ID: <20230901074224.524217-1-mauro.chehab@linux.intel.com> (raw)
From: Mauro Carvalho Chehab <mchehab@kernel.org>
cross-compiling will produce binaries that don't run at the
build machine. On such cases, we cannot produce testlist files.
Detect it, to avoid IGT builds to fail on cross builds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
tests/meson.build | 72 +++++++++++++++++++++++++++--------------------
1 file changed, 42 insertions(+), 30 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index aa27fd9aff7c..aa8e3434ce0e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -382,11 +382,13 @@ foreach prog : test_progs
test_executables += testexe
test_list += prog
name = prog.split('/').get(-1)
- testlist_files += custom_target(name + '.testlist',
- build_by_default : true,
- command : [testexe, '--show-testlist'],
- capture : true,
- output : name + '.testlist')
+ if not meson.is_cross_build()
+ testlist_files += custom_target(name + '.testlist',
+ build_by_default : true,
+ command : [testexe, '--show-testlist'],
+ capture : true,
+ output : name + '.testlist')
+ endif
endforeach
intel_progs = intel_i915_xe_progs
@@ -406,11 +408,13 @@ foreach prog : intel_progs
test_executables += testexe
test_list += prog
name = prog.split('/').get(-1)
- testlist_files += custom_target(name + '.testlist',
- build_by_default : true,
- command : [testexe, '--show-testlist'],
- capture : true,
- output : name + '.testlist')
+ if not meson.is_cross_build()
+ testlist_files += custom_target(name + '.testlist',
+ build_by_default : true,
+ command : [testexe, '--show-testlist'],
+ capture : true,
+ output : name + '.testlist')
+ endif
endforeach
foreach prog : msm_progs
@@ -433,11 +437,13 @@ if chamelium.found()
test_list += prog
test_executables += testexe
name = prog.split('/').get(-1)
- testlist_files += custom_target(name + '.testlist',
- build_by_default : true,
- command : [testexe, '--show-testlist'],
- capture : true,
- output : name + '.testlist')
+ if not meson.is_cross_build()
+ testlist_files += custom_target(name + '.testlist',
+ build_by_default : true,
+ command : [testexe, '--show-testlist'],
+ capture : true,
+ output : name + '.testlist')
+ endif
endforeach
test_deps += chamelium
endif
@@ -451,11 +457,13 @@ subdir('vc4')
subdir('vmwgfx')
gen_testlist = find_program('generate_testlist.sh')
-test_list_target = custom_target('testlist',
- output : 'test-list.txt',
- command : [ gen_testlist, '@OUTPUT@', test_list ],
- install : true,
- install_dir : libexecdir)
+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)
+endif
test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c',
dependencies : test_deps + [ libatomic ],
@@ -464,11 +472,13 @@ test_executables += executable('gem_concurrent_all', 'intel/gem_concurrent_all.c
install : true)
test_list += 'gem_concurrent_all'
-test_list_full_target = custom_target('testlist-full',
- output : 'test-list-full.txt',
- command : [ gen_testlist, '@OUTPUT@', test_list ],
- install : true,
- install_dir : libexecdir)
+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_script = find_program('igt_command_line.sh')
foreach prog : test_list
@@ -480,11 +490,13 @@ testexe = executable('gem_stress', 'intel/gem_stress.c',
install_dir : libexecdir,
install_rpath : libexecdir_rpathdir,
dependencies : igt_deps)
-testlist_files += custom_target('gem_stress.testlist',
- build_by_default : true,
- command : [testexe, '--show-testlist'],
- capture : true,
- output : 'gem_stress.testlist')
+if not meson.is_cross_build()
+ testlist_files += custom_target('gem_stress.testlist',
+ build_by_default : true,
+ command : [testexe, '--show-testlist'],
+ capture : true,
+ output : 'gem_stress.testlist')
+endif
image_files = [
'1080p-left.png',
--
2.41.0
next reply other threads:[~2023-09-01 7:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 7:42 Mauro Carvalho Chehab [this message]
2023-09-01 10:08 ` [igt-dev] [PATCH i-g-t] tests/meson.build: only generate testlists on native builds Kamil Konieczny
2023-09-01 10:58 ` [igt-dev] ✗ GitLab.Pipeline: warning for tests/meson.build: only generate testlists on native builds (rev3) Patchwork
2023-09-01 11:22 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork
2023-09-01 11:23 ` [igt-dev] ✓ Fi.CI.BAT: " Patchwork
2023-09-01 20:22 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-08-31 9:29 [igt-dev] [PATCH i-g-t] tests/meson.build: only generate testlists on native builds Mauro Carvalho Chehab
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=20230901074224.524217-1-mauro.chehab@linux.intel.com \
--to=mauro.chehab@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=ihf@google.com \
/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