Mesa (master): glsl/test: Don't run whitespace tests in parallel
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Aug 17 18:03:21 UTC 2020
Module: Mesa
Branch: master
Commit: c60cea0daa2b140547088188d90bce6f09bb1517
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c60cea0daa2b140547088188d90bce6f09bb1517
Author: Daniel Stone <daniels at collabora.com>
Date: Tue Aug 11 12:13:17 2020 +0100
glsl/test: Don't run whitespace tests in parallel
For some unfathomable reason, three out of these four tests often time
out when running within CI. On the assumption that there is some
parallelisation badness happening rather than the non-UNIX tests
entering infinite loops, try just marking them as serial-only.
This should have a negligible impact on runtime since they are quick to
execute.
Signed-off-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6301>
---
src/compiler/glsl/glcpp/meson.build | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index bc4eda26a76..bc892604ff0 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -85,6 +85,13 @@ if with_any_opengl and with_tests and host_machine.system() != 'windows'
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
+ # parallelisation badness happening rather than the non-UNIX tests entering
+ # infinite loops, try just marking them as serial-only.
+ #
+ # This should have a negligible impact on runtime since they are quick to
+ # execute.
foreach m : modes
test(
'glcpp test (@0@)'.format(m),
@@ -96,6 +103,7 @@ if with_any_opengl and with_tests and host_machine.system() != 'windows'
],
suite : ['compiler', 'glcpp'],
timeout: 60,
+ is_parallel: false,
)
endforeach
endif
More information about the mesa-commit
mailing list