[igt-dev] [PATCH i-g-t v5 4/7] tests/meson.build: create testlists for tests
Mauro Carvalho Chehab
mauro.chehab at linux.intel.com
Thu Aug 31 09:28:51 UTC 2023
On Wed, 30 Aug 2023 14:49:10 -0700
Ilja Friedel <ihf at google.com> wrote:
> Hi Mauro,
>
> on ChromeOS we are cross-compiling binaries inside of portage/gentoo
> servers for consumer devices. Which means these servers are typically
> unable to execute the binaries. (For instance on Intel and AMD they will
> try to load libdrm_intel.so/libdrm_amdgpu.so even though the servers don't
> have a GPU and don't need these libraries). Hence we have testplan disabled
> while building on the server. (We run the test binaries later on the
> devices.) Now this change reintroduces executing the compiled binaries on
> the server just when building them, for a testplan phase that will never
> happen on the server. Would it be possible to place the equivalent of "if
> testplan" around this code?
>
> As an aside, we don't run into problems compiling for Qualcomm/ARM. I am
> unclear why, as I don't see qemu or similar running. So maybe there already
> is a way to disable this?
Please don't top post. It makes harder to add comments at the right
order :-)
>
> Thank you,
>
> Ilja.
>
> On Wed, Aug 30, 2023 at 2:41 PM Mark Yacoub <markyacoub at chromium.org> wrote:
>
> > This is causing issues for IGT ChromeOS. Adding +ihf at google.com for
> > more context.
The testlist files are used for two purposes:
1. for documentation build;
2. for CI automation to run the tests.
While right now Intel CI doesn't depend on the produced testlists,
this may change in the future. So, instead of making the testlist
build dependent of testplan, the better seems to verify if the
build is not a cross-compilation, e. g. with a patch similar to
the enclosed one.
Could you please check if this will address the issue? I don't have
a cross-compilation environment handy to test it, so it would be
easier if you could test it for me.
Regards,
Mauro
---
[PATCH i-g-t] tests/meson.build: only generate testlists on native builds
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 at kernel.org>
diff --git a/tests/meson.build b/tests/meson.build
index c683e468da78..adb178d0bd39 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -370,11 +370,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
foreach prog : i915_progs
@@ -387,11 +389,13 @@ foreach prog : i915_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
if build_xe
@@ -405,11 +409,13 @@ if build_xe
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
build_info += 'Xe **experimental** tests enabled.'
endif
@@ -435,11 +441,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
@@ -452,11 +460,13 @@ if chamelium.found()
install : true)
test_list += name
test_executables += testexe
- 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
endif
subdir('amdgpu')
@@ -468,11 +478,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', 'i915/gem_concurrent_all.c',
dependencies : test_deps + [ libatomic ],
@@ -481,11 +493,13 @@ test_executables += executable('gem_concurrent_all', 'i915/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
@@ -497,11 +511,13 @@ testexe = executable('gem_stress', 'i915/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',
More information about the igt-dev
mailing list