OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Use different STRACEDIR folder for intel_devinfo_override_test

Browse Source 
Fixes
--- stderr ---
strace: Can't fopen 'meson-logs/strace/intel_device_info_override_test_120_/log.10613': No such file or directory

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17928>
This commit is contained in:
Yonggang Luo
2022-08-07 22:05:38 +08:00
committed by Marge Bot
parent 12bb9cba8b
commit 201a62cbba
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/meson/time-strace.sh
View File

@@ -1,6 +1,8 @@
#!/bin/sh
STRACEDIR=meson-logs/strace/$(for i in $@; do basename -z -- $i; echo -n _; done)
if [ "x$STRACEDIR" = "x" ]; then
STRACEDIR=meson-logs/strace/$(for i in $@; do basename -z -- $i; echo -n _; done)
fi
mkdir -p $STRACEDIR

9
src/intel/dev/meson.build
View File

@@ -66,15 +66,18 @@ if with_tests and with_tools.contains('drm-shim') and with_tools.contains('intel
include_directories : [inc_include, inc_src],
link_with : libintel_dev,
)
intel_drm_ld_preload = join_paths(meson.current_build_dir(), '..', 'tools', 'libintel_noop_drm_shim.so')
foreach _gens : platforms
gen = _gens[0]
foreach p : _gens[1]
test('intel_device_info_override_test_@0@'.format(p),
intel_devinfo_override_test,
args : '@0@'.format(gen),
env : [ 'LD_PRELOAD=@0@'.format(join_paths(
meson.current_build_dir(), '../tools/libintel_noop_drm_shim.so')),
'INTEL_STUB_GPU_PLATFORM=@0@'.format(p) ],
env : [
'LD_PRELOAD=@0@'.format(intel_drm_ld_preload),
'INTEL_STUB_GPU_PLATFORM=@0@'.format(p),
'STRACEDIR=meson-logs/strace/intel_device_info_override_test_@0@'.format(p),
],
suite : ['intel'],
)
endforeach