glsl/tests: Bump glcpp valgrind test timeout to 240 seconds

Once it's actually working as intended again, it may need that much
time.

v2:
* Bump to 240 seconds, still hit timeouts with 180.
* Don't change test priority.

Reviewed-by: Dylan Baker <dylan.c.baker@intel.com> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9528>

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 84ba068..e02de18 100644 (file)
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -82,9 +82,6 @@ glcpp = executable(
 # FIXME: these fail on windows due to whitespace differences
 if with_any_opengl and with_tests and host_machine.system() != 'windows' and with_glcpp_tests
   modes = ['unix', 'windows', 'oldmac', 'bizarro']
-  if dep_valgrind.found()
-    modes += ['valgrind']
-  endif
 
   # For some unfathomable reason, three out of these four tests often time out
   # when running within CI. On the assumption that there is some
@@ -107,4 +104,18 @@ if with_any_opengl and with_tests and host_machine.system() != 'windows' and wit
       is_parallel: false,
     )
   endforeach
+
+  if dep_valgrind.found()
+    test(
+      'glcpp test (valgrind)',
+      prog_python,
+      args : [
+        join_paths(meson.current_source_dir(), 'tests/glcpp_test.py'),
+        glcpp, join_paths(meson.current_source_dir(), 'tests'),
+        '--valgrind',
+      ],
+      suite : ['compiler', 'glcpp'],
+      timeout: 240,
+    )
+  endif
 endif