fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: fix process_test path

Browse source 
Make sure we only use winepath when needed.

Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Fixes: f8f1413070 ("util/u_process: add util_get_process_exec_path")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2690
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4304>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2020-03-26 14:07:39 +01:00 • committed by Daniel Stone
parent 1351ee0335
commit 8f573bdaaa
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/util/meson.build
View file

@ -285,12 +285,13 @@ if with_tests
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
)
if not (host_machine.system() == 'windows')
process_test_exe_full_path = process_test_exe.full_path()
else
if (host_machine.system() == 'windows' and cc.get_id() == 'gcc')
# This conversion is only required on mingw
process_test_exe_full_path = run_command(
'winepath', '-w', process_test_exe.full_path()
).stdout().strip()
else
process_test_exe_full_path = process_test_exe.full_path()
endif
test(