diff options
| author | Pierre-Eric Pelloux-Prayer <[email protected]> | 2020-03-26 14:07:39 +0100 |
|---|---|---|
| committer | Daniel Stone <[email protected]> | 2020-03-27 10:32:31 +0000 |
| commit | 8f573bdaaa7c41b19edf99e891665378b76d8fd4 (patch) | |
| tree | c5d91c6626e0fbee229167bdbd1ac58b209c0731 /src | |
| parent | 1351ee03352b12690233a73e160f92da2edecf16 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/meson.build | 7 |
1 files 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( |