Bug 1490272 - Use the marionette reftest implemenation on Windows, r=ato
authorJames Graham <james@hoppipolla.co.uk>
Tue, 11 Sep 2018 11:23:22 +0100
changeset 500418 4dfb6e690645619a71da734ee66ea658a1ef253a
parent 500417 e9a4d5c538be50c9b5c7cd2f1a4003508791d733
child 500419 d7c8b670ac687fc3e7b98820a5a4fecc046f51b0
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1490272
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1490272 - Use the marionette reftest implemenation on Windows, r=ato Differential Revision: https://phabricator.services.mozilla.com/D5519
testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini
testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini
testing/web-platform/meta/html/rendering/non-replaced-elements/the-hr-element-0/width.html.ini
testing/web-platform/meta/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html.ini
testing/web-platform/meta/quirks/historical/list-item-bullet-size.html.ini
testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini
testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini
testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini
testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
testing/web-platform/meta/svg/path/bearing/relative.svg.ini
testing/web-platform/meta/svg/path/bearing/zero.svg.ini
testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini
testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini
testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini
testing/web-platform/meta/svg/path/property/priority.svg.ini
testing/web-platform/meta/svg/pservers/reftests/radialgradient-basic-002.svg.ini
testing/web-platform/meta/svg/rendering/order/z-index.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini
testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini
testing/web-platform/meta/svg/shapes/rect-01.svg.ini
testing/web-platform/meta/svg/shapes/rect-02.svg.ini
testing/web-platform/meta/svg/shapes/rect-03.svg.ini
testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini
testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini
testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini
testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini
testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini
testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini
testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini
testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini
testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini
testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini
testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini
testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini
testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py
deleted file mode 100644
--- a/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-cell-width-s.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-cell-width-s.html]
-  expected:
-    if os == "win": FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-width-s.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-width-s.html]
-  expected:
-    if os == "win": FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/html/rendering/non-replaced-elements/the-hr-element-0/width.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[width.html]
-  expected:
-    if os == "win": FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content-rendering-rules/canvas_without_context_a.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[canvas_without_context_a.html]
-  expected:
-    if os == "win": FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/quirks/historical/list-item-bullet-size.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[list-item-bullet-size.html]
-  expected:
-    if os == "win": FAIL
--- a/testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini
+++ b/testing/web-platform/meta/svg/painting/reftests/paint-context-001.svg.ini
@@ -4,8 +4,12 @@
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini
+++ b/testing/web-platform/meta/svg/painting/reftests/paint-context-002.svg.ini
@@ -4,8 +4,12 @@
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini
+++ b/testing/web-platform/meta/svg/painting/reftests/paint-order-001.svg.ini
@@ -1,3 +1,7 @@
 [paint-order-001.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/bearing/zero.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/zero.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini
+++ b/testing/web-platform/meta/svg/path/closepath/segment-completing.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if debug and not e10s and (os == "linux") and (bits == 32): FAIL
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini
+++ b/testing/web-platform/meta/svg/path/distance/pathLength-zero-percentage.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini
+++ b/testing/web-platform/meta/svg/path/distance/pathLength-zero.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if debug and not e10s and (os == "linux") and (bits == 32): FAIL
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/path/property/priority.svg.ini
+++ b/testing/web-platform/meta/svg/path/property/priority.svg.ini
@@ -2,8 +2,12 @@
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/svg/pservers/reftests/radialgradient-basic-002.svg.ini
@@ -0,0 +1,4 @@
+[radialgradient-basic-002.svg]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
--- a/testing/web-platform/meta/svg/rendering/order/z-index.svg.ini
+++ b/testing/web-platform/meta/svg/rendering/order/z-index.svg.ini
@@ -1,7 +1,2 @@
 [z-index.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-01.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-01.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-02.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-02.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-03.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-03.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-05.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-05.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-06.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-06.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-07.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-07.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/ellipse-08.svg.ini
@@ -1,3 +1,7 @@
 [ellipse-08.svg]
   expected:
     if not (os == "win"): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/svg/shapes/rect-01.svg.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[rect-01.svg]
-  expected:
-    if os == "win": FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/svg/shapes/rect-02.svg.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[rect-02.svg]
-  expected:
-    if os == "win": FAIL
--- a/testing/web-platform/meta/svg/shapes/rect-03.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/rect-03.svg.ini
@@ -1,5 +1,9 @@
 [rect-03.svg]
   expected:
     if (os == "linux") and not webrender: PASS
     if os == "mac": PASS
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     FAIL
--- a/testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/reftests/pathlength-002.svg.ini
@@ -1,4 +1,8 @@
 [pathlength-002.svg]
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/reftests/pathlength-003.svg.ini
@@ -1,4 +1,8 @@
 [pathlength-003.svg]
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-complex-001.svg.ini
@@ -1,3 +1,7 @@
 [text-complex-001.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-complex-002.svg.ini
@@ -1,3 +1,7 @@
 [text-complex-002.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-001.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-001.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-002.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-002.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-003.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-003.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-005.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-005.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-006.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-006.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-007.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-007.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-101.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-101.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-inline-size-201.svg.ini
@@ -1,7 +1,2 @@
 [text-inline-size-201.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-multiline-001.svg.ini
@@ -1,7 +1,2 @@
 [text-multiline-001.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-multiline-002.svg.ini
@@ -1,7 +1,2 @@
 [text-multiline-002.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-multiline-003.svg.ini
@@ -1,7 +1,2 @@
 [text-multiline-003.svg]
-  expected:
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-shape-inside-001.svg.ini
@@ -1,3 +1,7 @@
 [text-shape-inside-001.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/text-shape-inside-002.svg.ini
@@ -1,3 +1,7 @@
 [text-shape-inside-002.svg]
   expected:
     if os != "win": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/textpath-shape-001.svg.ini
@@ -1,4 +1,8 @@
 [textpath-shape-001.svg]
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini
+++ b/testing/web-platform/meta/svg/text/reftests/textpath-side-001.svg.ini
@@ -1,4 +1,8 @@
 [textpath-side-001.svg]
   expected:
     if os == "linux": FAIL
     if os == "mac": FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -254,17 +254,17 @@ scheme host and port.""")
     gecko_group.add_argument("--setpref", dest="extra_prefs", action='append',
                              default=[], metavar="PREF=VALUE",
                              help="Defines an extra user preference (overrides those in prefs_root)")
     gecko_group.add_argument("--leak-check", dest="leak_check", action="store_true",
                              help="Enable leak checking")
     gecko_group.add_argument("--stylo-threads", action="store", type=int, default=1,
                              help="Number of parallel threads to use for stylo")
     gecko_group.add_argument("--reftest-internal", dest="reftest_internal", action="store_true",
-                             default=None, help="Enable reftest runner implemented inside Marionette")
+                             default=True, help="Enable reftest runner implemented inside Marionette")
     gecko_group.add_argument("--reftest-external", dest="reftest_internal", action="store_false",
                              help="Disable reftest runner implemented inside Marionette")
     gecko_group.add_argument("--reftest-screenshot", dest="reftest_screenshot", action="store",
                              choices=["always", "fail", "unexpected"], default="unexpected",
                              help="With --reftest-internal, when to take a screenshot")
     gecko_group.add_argument("--chaos", dest="chaos_mode_flags", action="store",
                              nargs="?", const=0xFFFFFFFF, type=int,
                              help="Enable chaos mode with the specified feature flag "
@@ -507,20 +507,16 @@ def check_args(kwargs):
             kwargs['extra_prefs'] = [kwargs['extra_prefs']]
         missing = any('=' not in prefarg for prefarg in kwargs['extra_prefs'])
         if missing:
             print >> sys.stderr, "Preferences via --setpref must be in key=value format"
             sys.exit(1)
         kwargs['extra_prefs'] = [tuple(prefarg.split('=', 1)) for prefarg in
                                  kwargs['extra_prefs']]
 
-    if kwargs["reftest_internal"] is None:
-        # Default to the internal reftest implementation on Linux and OSX
-        kwargs["reftest_internal"] = sys.platform.startswith("linux") or sys.platform.startswith("darwin")
-
     return kwargs
 
 
 def check_args_update(kwargs):
     set_from_config(kwargs)
 
     if kwargs["product"] is None:
         kwargs["product"] = "firefox"