Auto merge of #11436 - nox:s-osx-mac, r=jgraham

Fix all the Mac-specific test expectations

It's "mac", not "osx".

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11436)
<!-- Reviewable:end -->

tests/wpt/metadata/html/dom/reflection-embedded.html.ini

@@ -1,7 +1,7 @@
 [reflection-embedded.html]
   type: testharness
   disabled:
-    if os == "osx": https://github.com/servo/servo/issues/11100
+    if os == "mac": https://github.com/servo/servo/issues/11100
   [img.dir: typeof IDL attribute]
     expected: FAIL
 

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/canvas/to-data-url-test.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/constants-and-properties.html.ini

@@ -1,5 +1,5 @@
 [constants-and-properties.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini

@@ -1,7 +1,7 @@
 [context-attributes-alpha-depth-stencil-antialias.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: gl = getWebGL(1, 1, null, [ 0, 0, 0, 0 \], 1, 0) should be non-null. Was null]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini

@@ -1,7 +1,7 @@
 [context-eviction-with-garbage-collection.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: program != null should be true. Was false.]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html.ini

@@ -1,5 +1,5 @@
 [context-hidden-alpha.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost-restored.html.ini

@@ -1,5 +1,5 @@
 [context-lost-restored.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini

@@ -1,7 +1,7 @@
 [context-lost.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: gl.isContextLost() should be false. Threw exception TypeError: gl.isContextLost is not a function]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-upon-reload.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-type-test.html.ini

@@ -1,5 +1,5 @@
 [context-type-test.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/incorrect-context-object-behaviour.html.ini

@@ -1,7 +1,7 @@
 [incorrect-context-object-behaviour.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: contextA.compileShader(shaderB)]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini

@@ -1,7 +1,7 @@
 [methods.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Property either does not exist or is not a function: checkFramebufferStatus]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini

@@ -1,7 +1,7 @@
 [premultiplyalpha-test.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/resource-sharing-test.html.ini

@@ -1,7 +1,7 @@
 [resource-sharing-test.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: attempt to use a resource from the wrong context should fail with INVALID_OPERATION]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays-out-of-bounds.html.ini

@@ -1,5 +1,5 @@
 [angle-instanced-arrays-out-of-bounds.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays.html.ini

@@ -1,5 +1,5 @@
 [angle-instanced-arrays.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-blend-minmax.html.ini

@@ -1,7 +1,7 @@
 [ext-blend-minmax.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: getError expected: INVALID_ENUM. Was NO_ERROR : after evaluating: gl.blendEquation(MIN_EXT)]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-frag-depth.html.ini

@@ -1,7 +1,7 @@
 [ext-frag-depth.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-sRGB.html.ini

@@ -1,7 +1,7 @@
 [ext-sRGB.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-shader-texture-lod.html.ini

@@ -1,7 +1,7 @@
 [ext-shader-texture-lod.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-texture-filter-anisotropic.html.ini

@@ -1,7 +1,7 @@
 [ext-texture-filter-anisotropic.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-standard-derivatives.html.ini

@@ -1,7 +1,7 @@
 [oes-standard-derivatives.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #3: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-texture-float-linear.html.ini

@@ -1,7 +1,7 @@
 [oes-texture-float-linear.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini

@@ -1,7 +1,7 @@
 [shader-with-ivec3-return-value.frag.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
   [WebGL test #0: [unexpected fragment shader compile status\] (expected: true) Shader with ivec3 return value from function call should succeed]
     expected: FAIL
 

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini

@@ -1,7 +1,7 @@
 [shader-with-long-line.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
   [WebGL test #0: [unexpected vertex shader compile status\] (expected: true) shader that uses long lines should succeed]
     expected: FAIL
 

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini

@@ -2,7 +2,6 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
   [WebGL test #9: gl.isShader(vertexShader) should be true. Threw exception TypeError: gl.isShader is not a function]
     expected: FAIL
 

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini

@@ -3,5 +3,5 @@
   disabled: https://github.com/servo/servo/issues/10656
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
+    if os == "mac": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini

@@ -1,7 +1,6 @@
 [gl-geterror.html]
   type: testharness
   expected:
-    if os == "osx": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini

@@ -1,7 +1,6 @@
 [tex-sub-image-2d-bad-args.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
+    if os == "mac": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): TIMEOUT

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini

@@ -2,4 +2,3 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT

tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini

@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
+    if os == "mac": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): TIMEOUT