Mesa (master): Fix util/process test on Cygwin
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 15 21:32:41 UTC 2020
Module: Mesa
Branch: master
Commit: 0158f73f086e0fe1b29a1e7bba995acce71d6bb9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0158f73f086e0fe1b29a1e7bba995acce71d6bb9
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date: Wed Mar 25 13:22:30 2020 +0000
Fix util/process test on Cygwin
It seems meson returns the filename with extension for full_path(), even
though Cygwin does it's best to pretend the file doesn't have that
extension.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4514>
---
src/util/process_test.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/util/process_test.c b/src/util/process_test.c
index 00703df6034..ef7e2b4d4ad 100644
--- a/src/util/process_test.c
+++ b/src/util/process_test.c
@@ -75,6 +75,11 @@ test_util_get_process_exec_path (void)
error = true;
return;
}
+#ifdef __CYGWIN__
+ int i = strlen(build_path) - 4;
+ if ((i > 0) && (strcmp(&build_path[i], ".exe") == 0))
+ build_path[i] = 0;
+#endif
expect_equal_str(build_path, path, "util_get_process_name");
}
More information about the mesa-commit
mailing list