Mesa (main): meson: Bump version required for gtest protocol

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Dec 15 23:59:19 UTC 2021


Module: Mesa
Branch: main
Commit: 49c356a3356fbbe180ab9ec1027e744850550e53
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=49c356a3356fbbe180ab9ec1027e744850550e53

Author: Caio Oliveira <caio.oliveira at intel.com>
Date:   Wed Dec 15 01:30:36 2021 -0800

meson: Bump version required for gtest protocol

The feature was added in 0.55 but there was a bug when tests
crashed (and no XML file was generated) that was only fixed in 0.59.2.

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Acked-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14204>

---

 meson.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index c987073b537..07ef92dbff8 100644
--- a/meson.build
+++ b/meson.build
@@ -30,10 +30,11 @@ project(
   default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c11', 'cpp_std=c++14']
 )
 
-# For meson >= 0.55.0, meson can inject some extra arguments to get richer
-# results from gtest based tests.
+# In recent versions, meson can inject some extra arguments to get richer
+# results from gtest based tests.  Feature was added in 0.55, but requiring
+# 0.59.2 to include an important fix.  See https://github.com/mesonbuild/meson/pull/9283.
 gtest_test_protocol = 'exitcode'
-if meson.version().version_compare('>= 0.55.0')
+if meson.version().version_compare('>= 0.59.2')
   gtest_test_protocol = 'gtest'
 endif
 



More information about the mesa-commit mailing list