[igt-dev] [PATCH i-g-t 18/18] meson: replace "igt at xe/" by "igt@"
Zbigniew Kempczyński
zbigniew.kempczynski at intel.com
Fri Mar 10 08:23:26 UTC 2023
From: Mauro Carvalho Chehab <mchehab at kernel.org>
Change the building system to avoid the "/" path at the IGT Xe
tests, as those are causing problems for CI.
Signed-off-by: Mauro Carvalho Chehab <mchehab at kernel.org>
Acked-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
---
meson.build | 7 -
tests/intel-ci/xe-fast-feedback.testlist | 278 +++++++++++------------
tests/meson.build | 32 +++
tests/xe/meson.build | 32 ---
4 files changed, 171 insertions(+), 178 deletions(-)
diff --git a/meson.build b/meson.build
index 56875a2190..cbb7ead7d9 100644
--- a/meson.build
+++ b/meson.build
@@ -261,7 +261,6 @@ libexecdir = join_paths(get_option('libexecdir'), 'igt-gpu-tools')
amdgpudir = join_paths(libexecdir, 'amdgpu')
v3ddir = join_paths(libexecdir, 'v3d')
vc4dir = join_paths(libexecdir, 'vc4')
-xedir = join_paths(libexecdir, 'xe')
mandir = get_option('mandir')
pkgconfigdir = join_paths(libdir, 'pkgconfig')
python3 = find_program('python3', required : true)
@@ -310,18 +309,12 @@ if get_option('use_rpath')
endforeach
vc4_rpathdir = join_paths(vc4_rpathdir, libdir)
- xedir_rpathdir = '$ORIGIN'
- foreach p : xedir.split('/')
- xedir_rpathdir = join_paths(xedir_rpathdir, '..')
- endforeach
- xedir_rpathdir = join_paths(xedir_rpathdir, libdir)
else
bindir_rpathdir = ''
libexecdir_rpathdir = ''
amdgpudir_rpathdir = ''
v3d_rpathdir = ''
vc4_rpathdir = ''
- xedir_rpathdir = ''
endif
subdir('lib')
diff --git a/tests/intel-ci/xe-fast-feedback.testlist b/tests/intel-ci/xe-fast-feedback.testlist
index 25237784e2..6525b1676b 100644
--- a/tests/intel-ci/xe-fast-feedback.testlist
+++ b/tests/intel-ci/xe-fast-feedback.testlist
@@ -1,139 +1,139 @@
-igt at xe/xe_compute at compute-square
-igt at xe/xe_debugfs at base
-igt at xe/xe_debugfs at gt
-igt at xe/xe_debugfs at forcewake
-igt at xe/xe_dma_buf_sync at export-dma-buf-once
-igt at xe/xe_dma_buf_sync at export-dma-buf-once-read-sync
-igt at xe/xe_exec_balancer at twice-virtual-basic
-igt at xe/xe_exec_balancer at no-exec-virtual-basic
-igt at xe/xe_exec_balancer at twice-cm-virtual-basic
-igt at xe/xe_exec_balancer at no-exec-cm-virtual-basic
-igt at xe/xe_exec_balancer at twice-virtual-userptr
-igt at xe/xe_exec_balancer at no-exec-virtual-userptr
-igt at xe/xe_exec_balancer at twice-cm-virtual-userptr
-igt at xe/xe_exec_balancer at no-exec-cm-virtual-userptr
-igt at xe/xe_exec_balancer at twice-virtual-rebind
-igt at xe/xe_exec_balancer at no-exec-virtual-rebind
-igt at xe/xe_exec_balancer at twice-cm-virtual-rebind
-igt at xe/xe_exec_balancer at no-exec-cm-virtual-rebind
-igt at xe/xe_exec_balancer at twice-virtual-userptr-rebind
-igt at xe/xe_exec_balancer at no-exec-virtual-userptr-rebind
-igt at xe/xe_exec_balancer at twice-cm-virtual-userptr-rebind
-igt at xe/xe_exec_balancer at no-exec-cm-virtual-userptr-rebind
-igt at xe/xe_exec_balancer at twice-virtual-userptr-invalidate
-igt at xe/xe_exec_balancer at no-exec-virtual-userptr-invalidate
-igt at xe/xe_exec_balancer at twice-cm-virtual-userptr-invalidate
-igt at xe/xe_exec_balancer at no-exec-cm-virtual-userptr-invalidate
-igt at xe/xe_exec_balancer at twice-virtual-userptr-invalidate-race
-igt at xe/xe_exec_balancer at no-exec-virtual-userptr-invalidate-race
-igt at xe/xe_exec_balancer at twice-cm-virtual-userptr-invalidate-race
-igt at xe/xe_exec_balancer at no-exec-cm-virtual-userptr-invalidate-race
-igt at xe/xe_exec_balancer at twice-parallel-basic
-igt at xe/xe_exec_balancer at no-exec-parallel-basic
-igt at xe/xe_exec_balancer at twice-parallel-userptr
-igt at xe/xe_exec_balancer at no-exec-parallel-userptr
-igt at xe/xe_exec_balancer at twice-parallel-rebind
-igt at xe/xe_exec_balancer at no-exec-parallel-rebind
-igt at xe/xe_exec_balancer at twice-parallel-userptr-rebind
-igt at xe/xe_exec_balancer at no-exec-parallel-userptr-rebind
-igt at xe/xe_exec_balancer at twice-parallel-userptr-invalidate
-igt at xe/xe_exec_balancer at no-exec-parallel-userptr-invalidate
-igt at xe/xe_exec_balancer at twice-parallel-userptr-invalidate-race
-igt at xe/xe_exec_balancer at no-exec-parallel-userptr-invalidate-race
-igt at xe/xe_exec_basic at twice-basic
-igt at xe/xe_exec_basic at no-exec-basic
-igt at xe/xe_exec_basic at twice-basic-defer-mmap
-igt at xe/xe_exec_basic at no-exec-basic-defer-mmap
-igt at xe/xe_exec_basic at twice-basic-defer-bind
-igt at xe/xe_exec_basic at no-exec-basic-defer-bind
-igt at xe/xe_exec_basic at twice-userptr
-igt at xe/xe_exec_basic at no-exec-userptr
-igt at xe/xe_exec_basic at twice-rebind
-igt at xe/xe_exec_basic at no-exec-rebind
-igt at xe/xe_exec_basic at twice-userptr-rebind
-igt at xe/xe_exec_basic at no-exec-userptr-rebind
-igt at xe/xe_exec_basic at twice-userptr-invalidate
-igt at xe/xe_exec_basic at no-exec-userptr-invalidate
-igt at xe/xe_exec_basic at twice-userptr-invalidate-race
-igt at xe/xe_exec_basic at no-exec-userptr-invalidate-race
-igt at xe/xe_exec_basic at twice-bindengine
-igt at xe/xe_exec_basic at no-exec-bindengine
-igt at xe/xe_exec_basic at twice-bindengine-userptr
-igt at xe/xe_exec_basic at no-exec-bindengine-userptr
-igt at xe/xe_exec_basic at twice-bindengine-rebind
-igt at xe/xe_exec_basic at no-exec-bindengine-rebind
-igt at xe/xe_exec_basic at twice-bindengine-userptr-rebind
-igt at xe/xe_exec_basic at no-exec-bindengine-userptr-rebind
-igt at xe/xe_exec_basic at twice-bindengine-userptr-invalidate
-igt at xe/xe_exec_basic at no-exec-bindengine-userptr-invalidate
-igt at xe/xe_exec_basic at twice-bindengine-userptr-invalidate-race
-igt at xe/xe_exec_basic at no-exec-bindengine-userptr-invalidate-race
-igt at xe/xe_exec_compute_mode at twice-basic
-igt at xe/xe_exec_compute_mode at twice-preempt-fence-early
-igt at xe/xe_exec_compute_mode at twice-userptr
-igt at xe/xe_exec_compute_mode at twice-rebind
-igt at xe/xe_exec_compute_mode at twice-userptr-rebind
-igt at xe/xe_exec_compute_mode at twice-userptr-invalidate
-igt at xe/xe_exec_compute_mode at twice-userptr-invalidate-race
-igt at xe/xe_exec_compute_mode at twice-bindengine
-igt at xe/xe_exec_compute_mode at twice-bindengine-userptr
-igt at xe/xe_exec_compute_mode at twice-bindengine-rebind
-igt at xe/xe_exec_compute_mode at twice-bindengine-userptr-rebind
-igt at xe/xe_exec_compute_mode at twice-bindengine-userptr-invalidate
-igt at xe/xe_exec_compute_mode at twice-bindengine-userptr-invalidate-race
-igt at xe/xe_exec_reset at close-fd-no-exec
-igt at xe/xe_exec_reset at cm-close-fd-no-exec
-igt at xe/xe_exec_reset at virtual-close-fd-no-exec
-#igt at xe/xe_exec_threads at threads-basic
-igt at xe/xe_exec_threads at threads-shared-vm-basic
-igt at xe/xe_exec_threads at threads-fd-basic
-#igt at xe/xe_exec_threads at threads-hang-basic
-igt at xe/xe_exec_threads at threads-bal-basic
-igt at xe/xe_exec_threads at threads-cm-basic
-igt at xe/xe_exec_threads at threads-cm-fd-basic
-igt at xe/xe_exec_threads at threads-mixed-basic
-igt at xe/xe_exec_threads at threads-mixed-shared-vm-basic
-igt at xe/xe_exec_threads at threads-mixed-fd-basic
-igt at xe/xe_exec_threads at threads-bal-mixed-basic
-igt at xe/xe_exec_threads at threads-bal-mixed-shared-vm-basic
-igt at xe/xe_exec_threads at threads-bal-mixed-fd-basic
-igt at xe/xe_guc_pc at freq_basic_api
-igt at xe/xe_guc_pc at freq_fixed_idle
-igt at xe/xe_guc_pc at freq_range_idle
-igt at xe/xe_guc_pc at rc6_on_idle
-igt at xe/xe_guc_pc at rc0_on_exec
-igt at xe/xe_huc_copy at huc_copy
-igt at xe/xe_mmap at system
-igt at xe/xe_mmap at vram
-igt at xe/xe_mmap at vram-system
-igt at xe/xe_mmio at mmio-timestamp
-igt at xe/xe_mmio at mmio-invalid
-igt at xe/xe_prime_self_import at basic-with_one_bo
-igt at xe/xe_prime_self_import at basic-with_fd_dup
-igt at xe/xe_prime_self_import at export-vs-gem_close-race
-igt at xe/xe_prime_self_import at reimport-vs-gem_close-race
-#igt at xe/xe_prime_self_import at basic-llseek-size
-igt at xe/xe_query at query-engines
-igt at xe/xe_query at query-mem-usage
-igt at xe/xe_query at query-gts
-igt at xe/xe_query at query-config
-igt at xe/xe_query at query-hwconfig
-igt at xe/xe_query at query-topology
-igt at xe/xe_query at query-invalid-query
-igt at xe/xe_query at query-invalid-size
-#igt at xe/xe_vm at bind-once
-#igt at xe/xe_vm at scratch
-igt at xe/xe_vm at shared-pte-page
-igt at xe/xe_vm at shared-pde-page
-igt at xe/xe_vm at shared-pde2-page
-igt at xe/xe_vm at shared-pde3-page
-igt at xe/xe_vm at bind-engines-independent
-igt at xe/xe_vm at munmap-style-unbind-one-partial
-igt at xe/xe_vm at munmap-style-unbind-end
-igt at xe/xe_vm at munmap-style-unbind-front
-igt at xe/xe_vm at munmap-style-unbind-userptr-one-partial
-igt at xe/xe_vm at munmap-style-unbind-userptr-end
-igt at xe/xe_vm at munmap-style-unbind-userptr-front
-igt at xe/xe_vm at munmap-style-unbind-userptr-inval-end
-igt at xe/xe_vm at munmap-style-unbind-userptr-inval-front
-igt at xe/xe_waitfence at test
+igt at xe_compute@compute-square
+igt at xe_debugfs@base
+igt at xe_debugfs@gt
+igt at xe_debugfs@forcewake
+igt at xe_dma_buf_sync@export-dma-buf-once
+igt at xe_dma_buf_sync@export-dma-buf-once-read-sync
+igt at xe_exec_balancer@twice-virtual-basic
+igt at xe_exec_balancer@no-exec-virtual-basic
+igt at xe_exec_balancer@twice-cm-virtual-basic
+igt at xe_exec_balancer@no-exec-cm-virtual-basic
+igt at xe_exec_balancer@twice-virtual-userptr
+igt at xe_exec_balancer@no-exec-virtual-userptr
+igt at xe_exec_balancer@twice-cm-virtual-userptr
+igt at xe_exec_balancer@no-exec-cm-virtual-userptr
+igt at xe_exec_balancer@twice-virtual-rebind
+igt at xe_exec_balancer@no-exec-virtual-rebind
+igt at xe_exec_balancer@twice-cm-virtual-rebind
+igt at xe_exec_balancer@no-exec-cm-virtual-rebind
+igt at xe_exec_balancer@twice-virtual-userptr-rebind
+igt at xe_exec_balancer@no-exec-virtual-userptr-rebind
+igt at xe_exec_balancer@twice-cm-virtual-userptr-rebind
+igt at xe_exec_balancer@no-exec-cm-virtual-userptr-rebind
+igt at xe_exec_balancer@twice-virtual-userptr-invalidate
+igt at xe_exec_balancer@no-exec-virtual-userptr-invalidate
+igt at xe_exec_balancer@twice-cm-virtual-userptr-invalidate
+igt at xe_exec_balancer@no-exec-cm-virtual-userptr-invalidate
+igt at xe_exec_balancer@twice-virtual-userptr-invalidate-race
+igt at xe_exec_balancer@no-exec-virtual-userptr-invalidate-race
+igt at xe_exec_balancer@twice-cm-virtual-userptr-invalidate-race
+igt at xe_exec_balancer@no-exec-cm-virtual-userptr-invalidate-race
+igt at xe_exec_balancer@twice-parallel-basic
+igt at xe_exec_balancer@no-exec-parallel-basic
+igt at xe_exec_balancer@twice-parallel-userptr
+igt at xe_exec_balancer@no-exec-parallel-userptr
+igt at xe_exec_balancer@twice-parallel-rebind
+igt at xe_exec_balancer@no-exec-parallel-rebind
+igt at xe_exec_balancer@twice-parallel-userptr-rebind
+igt at xe_exec_balancer@no-exec-parallel-userptr-rebind
+igt at xe_exec_balancer@twice-parallel-userptr-invalidate
+igt at xe_exec_balancer@no-exec-parallel-userptr-invalidate
+igt at xe_exec_balancer@twice-parallel-userptr-invalidate-race
+igt at xe_exec_balancer@no-exec-parallel-userptr-invalidate-race
+igt at xe_exec_basic@twice-basic
+igt at xe_exec_basic@no-exec-basic
+igt at xe_exec_basic@twice-basic-defer-mmap
+igt at xe_exec_basic@no-exec-basic-defer-mmap
+igt at xe_exec_basic@twice-basic-defer-bind
+igt at xe_exec_basic@no-exec-basic-defer-bind
+igt at xe_exec_basic@twice-userptr
+igt at xe_exec_basic@no-exec-userptr
+igt at xe_exec_basic@twice-rebind
+igt at xe_exec_basic@no-exec-rebind
+igt at xe_exec_basic@twice-userptr-rebind
+igt at xe_exec_basic@no-exec-userptr-rebind
+igt at xe_exec_basic@twice-userptr-invalidate
+igt at xe_exec_basic@no-exec-userptr-invalidate
+igt at xe_exec_basic@twice-userptr-invalidate-race
+igt at xe_exec_basic@no-exec-userptr-invalidate-race
+igt at xe_exec_basic@twice-bindengine
+igt at xe_exec_basic@no-exec-bindengine
+igt at xe_exec_basic@twice-bindengine-userptr
+igt at xe_exec_basic@no-exec-bindengine-userptr
+igt at xe_exec_basic@twice-bindengine-rebind
+igt at xe_exec_basic@no-exec-bindengine-rebind
+igt at xe_exec_basic@twice-bindengine-userptr-rebind
+igt at xe_exec_basic@no-exec-bindengine-userptr-rebind
+igt at xe_exec_basic@twice-bindengine-userptr-invalidate
+igt at xe_exec_basic@no-exec-bindengine-userptr-invalidate
+igt at xe_exec_basic@twice-bindengine-userptr-invalidate-race
+igt at xe_exec_basic@no-exec-bindengine-userptr-invalidate-race
+igt at xe_exec_compute_mode@twice-basic
+igt at xe_exec_compute_mode@twice-preempt-fence-early
+igt at xe_exec_compute_mode@twice-userptr
+igt at xe_exec_compute_mode@twice-rebind
+igt at xe_exec_compute_mode@twice-userptr-rebind
+igt at xe_exec_compute_mode@twice-userptr-invalidate
+igt at xe_exec_compute_mode@twice-userptr-invalidate-race
+igt at xe_exec_compute_mode@twice-bindengine
+igt at xe_exec_compute_mode@twice-bindengine-userptr
+igt at xe_exec_compute_mode@twice-bindengine-rebind
+igt at xe_exec_compute_mode@twice-bindengine-userptr-rebind
+igt at xe_exec_compute_mode@twice-bindengine-userptr-invalidate
+igt at xe_exec_compute_mode@twice-bindengine-userptr-invalidate-race
+igt at xe_exec_reset@close-fd-no-exec
+igt at xe_exec_reset@cm-close-fd-no-exec
+igt at xe_exec_reset@virtual-close-fd-no-exec
+#igt at xe_exec_threads@threads-basic
+igt at xe_exec_threads@threads-shared-vm-basic
+igt at xe_exec_threads@threads-fd-basic
+#igt at xe_exec_threads@threads-hang-basic
+igt at xe_exec_threads@threads-bal-basic
+igt at xe_exec_threads@threads-cm-basic
+igt at xe_exec_threads@threads-cm-fd-basic
+igt at xe_exec_threads@threads-mixed-basic
+igt at xe_exec_threads@threads-mixed-shared-vm-basic
+igt at xe_exec_threads@threads-mixed-fd-basic
+igt at xe_exec_threads@threads-bal-mixed-basic
+igt at xe_exec_threads@threads-bal-mixed-shared-vm-basic
+igt at xe_exec_threads@threads-bal-mixed-fd-basic
+igt at xe_guc_pc@freq_basic_api
+igt at xe_guc_pc@freq_fixed_idle
+igt at xe_guc_pc@freq_range_idle
+igt at xe_guc_pc@rc6_on_idle
+igt at xe_guc_pc@rc0_on_exec
+igt at xe_huc_copy@huc_copy
+igt at xe_mmap@system
+igt at xe_mmap@vram
+igt at xe_mmap@vram-system
+igt at xe_mmio@mmio-timestamp
+igt at xe_mmio@mmio-invalid
+igt at xe_prime_self_import@basic-with_one_bo
+igt at xe_prime_self_import@basic-with_fd_dup
+igt at xe_prime_self_import@export-vs-gem_close-race
+igt at xe_prime_self_import@reimport-vs-gem_close-race
+#igt at xe_prime_self_import@basic-llseek-size
+igt at xe_query@query-engines
+igt at xe_query@query-mem-usage
+igt at xe_query@query-gts
+igt at xe_query@query-config
+igt at xe_query@query-hwconfig
+igt at xe_query@query-topology
+igt at xe_query@query-invalid-query
+igt at xe_query@query-invalid-size
+#igt at xe_vm@bind-once
+#igt at xe_vm@scratch
+igt at xe_vm@shared-pte-page
+igt at xe_vm@shared-pde-page
+igt at xe_vm@shared-pde2-page
+igt at xe_vm@shared-pde3-page
+igt at xe_vm@bind-engines-independent
+igt at xe_vm@munmap-style-unbind-one-partial
+igt at xe_vm@munmap-style-unbind-end
+igt at xe_vm@munmap-style-unbind-front
+igt at xe_vm@munmap-style-unbind-userptr-one-partial
+igt at xe_vm@munmap-style-unbind-userptr-end
+igt at xe_vm@munmap-style-unbind-userptr-front
+igt at xe_vm@munmap-style-unbind-userptr-inval-end
+igt at xe_vm@munmap-style-unbind-userptr-inval-front
+igt at xe_waitfence@test
diff --git a/tests/meson.build b/tests/meson.build
index 4a1722b3d4..632e36e059 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -241,6 +241,28 @@ i915_progs = [
'sysfs_timeslice_duration',
]
+xe_progs = [
+ 'xe_compute',
+ 'xe_dma_buf_sync',
+ 'xe_debugfs',
+ 'xe_evict',
+ 'xe_exec_balancer',
+ 'xe_exec_basic',
+ 'xe_exec_compute_mode',
+ 'xe_exec_fault_mode',
+ 'xe_exec_reset',
+ 'xe_exec_threads',
+ 'xe_guc_pc',
+ 'xe_huc_copy',
+ 'xe_mmap',
+ 'xe_mmio',
+ 'xe_pm',
+ 'xe_prime_self_import',
+ 'xe_query',
+ 'xe_vm',
+ 'xe_waitfence',
+]
+
msm_progs = [
'msm_mapping',
'msm_recovery',
@@ -289,6 +311,16 @@ foreach prog : i915_progs
test_list += prog
endforeach
+foreach prog : xe_progs
+ test_executables += executable(prog,
+ join_paths('xe', prog + '.c'),
+ dependencies : test_deps,
+ install_dir : libexecdir,
+ install_rpath : libexecdir_rpathdir,
+ install : true)
+ test_list += prog
+endforeach
+
foreach prog : msm_progs
test_executables += executable(prog, join_paths('msm', prog + '.c'),
dependencies : test_deps,
diff --git a/tests/xe/meson.build b/tests/xe/meson.build
index bcc2f58ba8..bb344f95d5 100644
--- a/tests/xe/meson.build
+++ b/tests/xe/meson.build
@@ -1,33 +1 @@
-xe_progs = [
- 'xe_compute',
- 'xe_dma_buf_sync',
- 'xe_debugfs',
- 'xe_evict',
- 'xe_exec_balancer',
- 'xe_exec_basic',
- 'xe_exec_compute_mode',
- 'xe_exec_fault_mode',
- 'xe_exec_reset',
- 'xe_exec_threads',
- 'xe_guc_pc',
- 'xe_huc_copy',
- 'xe_mmap',
- 'xe_mmio',
- 'xe_pm',
- 'xe_prime_self_import',
- 'xe_query',
- 'xe_vm',
- 'xe_waitfence',
-]
-xe_deps = test_deps
-
xe_test_config = meson.current_source_dir() + '/xe_test_config.json'
-
-foreach prog : xe_progs
- test_executables += executable(prog, prog + '.c',
- dependencies : xe_deps,
- install_dir : xedir,
- install_rpath : xedir_rpathdir,
- install : true)
- test_list += join_paths('xe', prog)
-endforeach
--
2.34.1
More information about the igt-dev
mailing list