From 606bad91b0fe6f2e221fb26ef6c4c7111f0ef38a Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 30 Aug 2015 17:03:57 -0400 Subject: [PATCH 1/2] Revert "Enable experimental layout prefs for CSSWG reftests." This reverts commit 447b5b560c05ee19175523cc5d9184c6f4a4503c. --- tests/wpt/metadata-css/__dir__.ini | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 tests/wpt/metadata-css/__dir__.ini diff --git a/tests/wpt/metadata-css/__dir__.ini b/tests/wpt/metadata-css/__dir__.ini deleted file mode 100644 index ac9f35f358b..00000000000 --- a/tests/wpt/metadata-css/__dir__.ini +++ /dev/null @@ -1,9 +0,0 @@ -prefs: ["layout.flex.enabled:true", - "layout.flex-direction.enabled:true", - "layout.columns.enabled:true", - "layout.column-width.enabled:true", - "layout.column-count.enabled:true", - "layout.column-gap.enabled:true", - "layout.writing-mode.enabled:true", - "layout.text-orientation.enabled:true", - "layout.viewport.enabled:true"] From 146118834948dd9c4ff6dbc6a94990633a97b84c Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 30 Aug 2015 17:04:09 -0400 Subject: [PATCH 2/2] Revert "Allow wptrunner to enable prefs for Servo." This reverts commit 0d6f410a3ffe7448bbd7d89690bee5991f95be7d. --- tests/wpt/harness/wptrunner/executors/executorservo.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py index 1172a97358f..b0e0eaeda27 100644 --- a/tests/wpt/harness/wptrunner/executors/executorservo.py +++ b/tests/wpt/harness/wptrunner/executors/executorservo.py @@ -65,10 +65,6 @@ class ServoTestharnessExecutor(ProcessTestExecutor): args = ["--cpu", "--hard-fail", "-u", "Servo/wptrunner", "-z", self.test_url(test)] for stylesheet in self.browser.user_stylesheets: args += ["--user-stylesheet", stylesheet] - - for pref in test.environment.get('prefs', {}): - args += ["--pref", pref] - debug_args, command = browser_command(self.binary, args, self.debug_info) self.command = command @@ -199,8 +195,6 @@ class ServoRefTestExecutor(ProcessTestExecutor): "--output=%s" % output_path, full_url] for stylesheet in self.browser.user_stylesheets: self.command += ["--user-stylesheet", stylesheet] - for pref in test.environment.get('prefs', {}): - self.command += ["--pref", pref] env = os.environ.copy() env["HOST_FILE"] = self.hosts_path