Mesa (staging/21.0): Revert "glsl/test: Don't run whitespace tests in parallel"

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: aa8bff051eaee17bf023c69a4a06df37c35daf75
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa8bff051eaee17bf023c69a4a06df37c35daf75

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Feb 19 17:59:56 2021 +0100

Revert "glsl/test: Don't run whitespace tests in parallel"

This reverts commit c60cea0daa2b140547088188d90bce6f09bb1517.

Didn't have the intended effect, and slowed down the meson test run.

Reviewed-by: Dylan Baker <dylan.c.baker at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9528>
(cherry picked from commit 5057f14cbaa4810995c959a96f1e7047a781ff38)

---

 .pick_status.json                   | 2 +-
 src/compiler/glsl/glcpp/meson.build | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c844df020a6..48946b5b1df 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2380,7 +2380,7 @@
         "description": "Revert \"glsl/test: Don't run whitespace tests in parallel\"",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c60cea0daa2b140547088188d90bce6f09bb1517"
     },
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 9c40fd72c61..6582b39ad70 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -86,13 +86,6 @@ 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),
@@ -104,7 +97,6 @@ if with_any_opengl and with_tests and host_machine.system() != 'windows'
       ],
       suite : ['compiler', 'glcpp'],
       timeout: 60,
-      is_parallel: false,
     )
   endforeach
 endif