aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2020-02-21 15:59:53 -0500
committerGitHub <noreply@github.com>2020-02-21 15:59:53 -0500
commit87d28b97c623abb1ec10280b06830b05c19190dc (patch)
tree978c4b7cc04724ac4632fb39d81c34b79d53b6b8
parent10e85760cf8b167fb8f01af76377a0c657b2434a (diff)
parent9fa19e405f52381c16d04ce7dc1468de30ec7a3c (diff)
downloadservo-87d28b97c623abb1ec10280b06830b05c19190dc.tar.gz
servo-87d28b97c623abb1ec10280b06830b05c19190dc.zip
Auto merge of #25825 - servo:jdm-patch-36, r=jdm
Disable complex-glsl-does-not-crash.html I keep seeing leftover processes taking 0% cpu on macOS workers that are running this test. Let's turn it off and see if the frequency of #25513 goes down at all.
-rw-r--r--tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini b/tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini
new file mode 100644
index 00000000000..39238883041
--- /dev/null
+++ b/tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini
@@ -0,0 +1,2 @@
+[complex-glsl-does-not-crash.html]
+ disabled: Causes shutdown deadlocks on macOS