aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2016-09-10 17:02:47 -0700
committerEric Anholt <eric@anholt.net>2016-10-06 17:11:03 -0700
commit19a8a4cd7b6fcee5898741ab6fe0d56b0223b714 (patch)
tree0f7140c3ec42852d5dd84f312e2fa28718060a21
parentf719ac2af7cde4e0ab94facf954c29c0f2edf909 (diff)
downloadservo-19a8a4cd7b6fcee5898741ab6fe0d56b0223b714.tar.gz
servo-19a8a4cd7b6fcee5898741ab6fe0d56b0223b714.zip
webgl: Enable all the tests on linux
Now that testing is being done using OSMesa on the Linux side as well, our test behavior matches Mac's pretty closely.
-rw-r--r--tests/wpt/metadata/webgl/conformance-1.0.3/__dir__.ini2
-rw-r--r--tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini4
-rw-r--r--tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini4
-rw-r--r--tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini4
-rw-r--r--tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini4
5 files changed, 8 insertions, 10 deletions
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/__dir__.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/__dir__.ini
deleted file mode 100644
index 0d819131e69..00000000000
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/__dir__.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled:
- if os == "linux": https://github.com/servo/servo/issues/9331
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
index 7f14a9449b1..e85893ee2a5 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
@@ -1,6 +1,8 @@
[readPixelsBadArgs.html]
type: testharness
- expected: TIMEOUT
+ expected:
+ if os == "linux": CRASH
+ if os == "mac": TIMEOUT
[WebGL test #0: testReadPixels]
expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini
index 1b3d09229b9..3704c6c4f1b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/reading/read-pixels-pack-alignment.html.ini
@@ -1,6 +1,8 @@
[read-pixels-pack-alignment.html]
type: testharness
- expected: TIMEOUT
+ expected:
+ if os == "linux": CRASH
+ if os == "mac": TIMEOUT
[WebGL test #3: 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-npot-video.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
index b20314b47d2..f3b2d494241 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
@@ -1,5 +1,3 @@
[texture-npot-video.html]
type: testharness
- expected:
- if os == "linux": CRASH
- if os == "mac": TIMEOUT
+ expected: TIMEOUT
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
index 3941cdd91e2..f8fdcc1faf8 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
@@ -1,5 +1,3 @@
[uniform-default-values.html]
type: testharness
- expected:
- if os == "linux": CRASH
- if os == "mac": ERROR
+ expected: ERROR