Module: Mesa Branch: master Commit: 8f573bdaaa7c41b19edf99e891665378b76d8fd4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f573bdaaa7c41b19edf99e891665378b76d8fd4
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Thu Mar 26 14:07:39 2020 +0100 util: fix process_test path Make sure we only use winepath when needed. Reviewed-by: Daniel Stone <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Fixes: f8f1413070a ("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> --- src/util/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/meson.build b/src/util/meson.build index 77e3973c1a0..e30029063c0 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -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( _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
