Update test expectations, remove webrender prefs/cmd line.

atouchet · Sep 28, 2016 · dd4827d · dd4827d
1 parent f562c42
commit dd4827d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 13 deletions.
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
@@ -307,7 +307,7 @@ def package(self, release=False, dev=False, android=None, debug=False, debugger=
                     delete(dir_to_package + '/build/' + f)
             print("Writing runservo.sh")
             # TODO: deduplicate this arg list from post_build_commands
-            servo_args = ['-w', '-b',
+            servo_args = ['-b',
                           '--pref', 'dom.mozbrowser.enabled',
                           '--pref', 'dom.forcetouch.enabled',
                           '--pref', 'shell.builtin-key-shortcuts.enabled=false',

diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py
@@ -98,8 +98,7 @@ def run(self, params, release=False, dev=False, android=None, debug=False, debug
                 # Convert to a relative path to avoid mingw -> Windows path conversions
                 browserhtml_path = path.relpath(browserhtml_path, os.getcwd())
 
-            args = args + ['-w',
-                           '--pref', 'dom.mozbrowser.enabled',
+            args = args + ['--pref', 'dom.mozbrowser.enabled',
                            '--pref', 'dom.forcetouch.enabled',
                            '--pref', 'shell.builtin-key-shortcuts.enabled=false',
                            path.join(browserhtml_path, 'out', 'index.html')]

diff --git a/resources/android_params b/resources/android_params
@@ -6,5 +6,4 @@
 # lines (the "-p" and "10" are separate even though they are related).
 
 servo
--w
 http://en.wikipedia.org/wiki/Rust
diff --git a/resources/package-prefs.json b/resources/package-prefs.json
@@ -6,7 +6,6 @@
   "dom.serviceworker.timeout_seconds": 60,
   "dom.testable_crash.enabled": false,
   "dom.testbinding.enabled": false,
-  "gfx.webrender.enabled": true,
   "js.baseline.enabled": true,
   "js.ion.enabled": true,
   "js.asmjs.enabled": true,

diff --git a/resources/prefs.json b/resources/prefs.json
@@ -6,7 +6,6 @@
   "dom.serviceworker.timeout_seconds": 60,
   "dom.testable_crash.enabled": false,
   "dom.testbinding.enabled": false,
-  "gfx.webrender.enabled": false,
   "js.baseline.enabled": true,
   "js.ion.enabled": true,
   "js.asmjs.enabled": true,

diff --git a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-brightness.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-brightness.htm.ini
@@ -1,3 +1,3 @@
 [css-filters-animation-brightness.htm]
   type: reftest
-  expected: CRASH
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini
diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,4 @@ @@
     # lines (the "-p" and "10" are separate even though they are related).
     servo
-    -w
     http://en.wikipedia.org/wiki/Rust