diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-30 14:04:10 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-30 14:04:10 -0600 |
| commit | ccb8e4655759341e1b45139217cae7d8c2f7ec48 (patch) | |
| tree | 90a7259e3381afed1cb3fa2f7a0000660261b956 | |
| parent | 86da67bb1e229f16b13892c42bd2a444b1b97644 (diff) | |
| parent | 0d6f410a3ffe7448bbd7d89690bee5991f95be7d (diff) | |
| download | servo-ccb8e4655759341e1b45139217cae7d8c2f7ec48.tar.gz servo-ccb8e4655759341e1b45139217cae7d8c2f7ec48.zip | |
Auto merge of #7456 - jdm:cssprefs, r=jdm
Enable experimental layout prefs for CSSWG reftests.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7456)
<!-- Reviewable:end -->
| -rw-r--r-- | tests/wpt/harness/wptrunner/executors/executorservo.py | 6 | ||||
| -rw-r--r-- | tests/wpt/metadata-css/__dir__.ini | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py index b0e0eaeda27..1172a97358f 100644 --- a/tests/wpt/harness/wptrunner/executors/executorservo.py +++ b/tests/wpt/harness/wptrunner/executors/executorservo.py @@ -65,6 +65,10 @@ 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 @@ -195,6 +199,8 @@ 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 diff --git a/tests/wpt/metadata-css/__dir__.ini b/tests/wpt/metadata-css/__dir__.ini new file mode 100644 index 00000000000..ac9f35f358b --- /dev/null +++ b/tests/wpt/metadata-css/__dir__.ini @@ -0,0 +1,9 @@ +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"] |