From dd4827d85f3484d0d05b282ad30f3f56b1c1c633 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 28 Sep 2016 18:42:30 +1000 Subject: [PATCH] Update test expectations, remove webrender prefs/cmd line. --- python/servo/package_commands.py | 2 +- python/servo/post_build_commands.py | 3 +-- resources/android_params | 1 - resources/package-prefs.json | 1 - resources/prefs.json | 1 - .../html/css-filters-animation-brightness.htm.ini | 2 +- .../filters-1_dev/html/filters-test-brightness-001.htm.ini | 3 --- .../filters-1_dev/html/filters-test-brightness-002.htm.ini | 3 --- 8 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini delete mode 100644 tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index fbc659d5696..41a0f35467b 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -307,7 +307,7 @@ class PackageCommands(CommandBase): 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 index 5f40683e19c..0dc5bc498bd 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -98,8 +98,7 @@ class PostBuildCommands(CommandBase): # 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 index 81026559f37..17775237c00 100644 --- 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 index e111e65730d..62c13fe617f 100644 --- 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 index 35961dee0e2..7c7fdabb61c 100644 --- 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 index 121b2598fe6..ee26622e1e9 100644 --- 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 deleted file mode 100644 index aad56d32579..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[filters-test-brightness-001.htm] - type: reftest - expected: CRASH 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 deleted file mode 100644 index 5f60bdd1db3..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[filters-test-brightness-002.htm] - type: reftest - expected: CRASH