From 201a62cbbae2c39a8b27c7a7b46cecac0011db68 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sun, 7 Aug 2022 22:05:38 +0800 Subject: [PATCH] meson: Use different STRACEDIR folder for intel_devinfo_override_test 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 Acked-by: Erik Faye-Lund Part-of: --- .gitlab-ci/meson/time-strace.sh | 4 +++- src/intel/dev/meson.build | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/meson/time-strace.sh b/.gitlab-ci/meson/time-strace.sh index d579529f2a6..705f3457e3e 100755 --- a/.gitlab-ci/meson/time-strace.sh +++ b/.gitlab-ci/meson/time-strace.sh @@ -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 diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build index 8fb9b8776eb..44a0c13f55c 100644 --- a/src/intel/dev/meson.build +++ b/src/intel/dev/meson.build @@ -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