aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-16 09:10:56 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-16 09:10:56 +0530
commit0293aa2e522c9c400dc7deed4ab4595ff8bb3123 (patch)
tree21eb78d309a254465067a135afdec45808cab129
parentb542721ce99cad591531eca5e3765d44fafb8bda (diff)
parentf6a337772ab6c02feed55681966ef2613a4905af (diff)
downloadservo-0293aa2e522c9c400dc7deed4ab4595ff8bb3123.tar.gz
servo-0293aa2e522c9c400dc7deed4ab4595ff8bb3123.zip
Auto merge of #8537 - eefriedman:webgl-metadata-test-type, r=jdm
Fix the metadata for webgl tests. These are reftests, not tests using the test harness. CC #8414. (This fixes the immediate issue, but we should also fix the error message.) <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8537) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/clearcolor.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/draw_arrays_simple.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas2d.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_simple.html.ini2
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/clearcolor.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/clearcolor.html.ini
index 1e165de7e35..c162145cca0 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/clearcolor.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/clearcolor.html.ini
@@ -1,4 +1,4 @@
[clearcolor.html]
- type: testharness
+ type: reftest
disabled:
if os == "linux": https://github.com/servo/servo/issues/7931
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/draw_arrays_simple.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/draw_arrays_simple.html.ini
index 7acc6858c99..66f58c20d49 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/draw_arrays_simple.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/draw_arrays_simple.html.ini
@@ -1,5 +1,5 @@
[draw_arrays_simple.html]
- type: testharness
+ type: reftest
disabled:
if os == "linux": https://github.com/servo/servo/issues/7931
if os == "mac": https://github.com/servo/servo/issues/8486
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini
index 61aa93410a8..662eb7a102c 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas.html.ini
@@ -1,5 +1,5 @@
[tex_image_2d_canvas.html]
- type: testharness
+ type: reftest
disabled:
if os == "linux": https://github.com/servo/servo/issues/7931
if os == "mac": https://github.com/servo/servo/issues/8486
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas2d.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas2d.html.ini
index b9806cb8059..68d2bcd471e 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas2d.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas2d.html.ini
@@ -1,5 +1,5 @@
[tex_image_2d_canvas2d.html]
- type: testharness
+ type: reftest
disabled:
if os == "linux": https://github.com/servo/servo/issues/7931
if os == "mac": https://github.com/servo/servo/issues/8486
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini
index fe7aa9f7c18..bae1aef26e0 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini
@@ -1,4 +1,4 @@
[tex_image_2d_canvas_no_context.html]
- type: testharness
+ type: reftest
disabled:
if os == "linux": https://github.com/servo/servo/issues/7931
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_simple.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_simple.html.ini
index 17c41b8f383..9e5294789c9 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_simple.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_simple.html.ini
@@ -1,5 +1,5 @@
[tex_image_2d_simple.html]
- type: testharness
+ type: reftest
disabled:
if os == "linux": https://github.com/servo/servo/issues/7931
if os == "mac": https://github.com/servo/servo/issues/8486