From 1caf82bc0f181e139293c92ab474856775b11bae Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 8 Aug 2016 09:46:31 -0700 Subject: [PATCH] Remove expected-crash state of many WebGL tests on Linux. These tests are still all skipped currently (see #9331), but with skipping removed, these didn't crash with Mesa 12.1 on Haswell (Intel). --- .../conformance/textures/tex-sub-image-2d-bad-args.html.ini | 2 -- .../conformance/textures/texture-complete.html.ini | 2 -- .../conformance/textures/texture-sub-image-cube-maps.html.ini | 2 -- .../textures/texture-transparent-pixels-initialized.html.ini | 4 ---- .../conformance/textures/texture-upload-cube-maps.html.ini | 2 -- .../conformance/typedarrays/data-view-test.html.ini | 4 ---- .../conformance/uniforms/null-uniform-location.html.ini | 2 -- .../conformance/uniforms/uniform-location.html.ini | 2 -- .../conformance/uniforms/uniform-values-per-program.html.ini | 2 -- 9 files changed, 22 deletions(-) delete mode 100644 tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-transparent-pixels-initialized.html.ini delete mode 100644 tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini index 48a5a70fda1..5ed05f7bf40 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini @@ -1,7 +1,5 @@ [tex-sub-image-2d-bad-args.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-complete.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-complete.html.ini index 521d6449e3a..76ee42aadcf 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-complete.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-complete.html.ini @@ -1,7 +1,5 @@ [texture-complete.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini index 4766a121d4e..41d4267c9e6 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini @@ -1,7 +1,5 @@ [texture-sub-image-cube-maps.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-transparent-pixels-initialized.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-transparent-pixels-initialized.html.ini deleted file mode 100644 index daef2612d9f..00000000000 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-transparent-pixels-initialized.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[texture-transparent-pixels-initialized.html] - type: testharness - expected: - if os == "linux": CRASH diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini index 78c55a6b51c..99291ec52ff 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini @@ -1,7 +1,5 @@ [texture-upload-cube-maps.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini deleted file mode 100644 index e921f03979d..00000000000 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[data-view-test.html] - type: testharness - expected: - if os == "linux": CRASH diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/null-uniform-location.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/null-uniform-location.html.ini index 266f0cc8d7a..2183438b55f 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/null-uniform-location.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/null-uniform-location.html.ini @@ -1,7 +1,5 @@ [null-uniform-location.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #6: callUniformFunction('uniform1i') should be undefined. Threw exception TypeError: func is undefined] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-location.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-location.html.ini index d8c77587466..25f129ccc2b 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-location.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-location.html.ini @@ -1,7 +1,5 @@ [uniform-location.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #1: contextA.uniformMatrix4fv(locationA, false, mat) threw exception TypeError: contextA.uniformMatrix4fv is not a function] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-values-per-program.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-values-per-program.html.ini index 083f318219f..03cd6ea4a3b 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-values-per-program.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-values-per-program.html.ini @@ -1,7 +1,5 @@ [uniform-values-per-program.html] type: testharness - expected: - if os == "linux": CRASH [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL