Mesa (master): Revert "glcpp: disable 'windows' tests"

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jan 28 16:12:21 UTC 2021


Module: Mesa
Branch: master
Commit: 6a29632dd25f79a00824e461aea969fcc29bf04b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a29632dd25f79a00824e461aea969fcc29bf04b

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jan 27 08:50:57 2021 -0500

Revert "glcpp: disable 'windows' tests"

This reverts commit f7527f7f652814a700dddc13a5b737571248c86d.

Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8738>

---

 src/compiler/glsl/glcpp/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 9c40fd72c61..a7dce6d9a3d 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -81,7 +81,7 @@ glcpp = executable(
 
 # FIXME: these fail on windows due to whitespace differences
 if with_any_opengl and with_tests and host_machine.system() != 'windows'
-  modes = ['unix', 'oldmac', 'bizarro']
+  modes = ['unix', 'windows', 'oldmac', 'bizarro']
   if dep_valgrind.found()
     modes += ['valgrind']
   endif



More information about the mesa-commit mailing list