Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7465 - jdm:revertcssprefs, r=jdm

Browse source 
Revert #7456

Experiment gone wrong; my apologies.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7465)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-30 15:53:31 -06:00
commit 9b2aa095f2
2 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/wpt/harness/wptrunner/executors/executorservo.py
View file

@ -65,10 +65,6 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
args = ["--cpu", "--hard-fail", "-u", "Servo/wptrunner", "-z", self.test_url(test)] args = ["--cpu", "--hard-fail", "-u", "Servo/wptrunner", "-z", self.test_url(test)]
for stylesheet in self.browser.user_stylesheets: for stylesheet in self.browser.user_stylesheets:
args += ["--user-stylesheet", stylesheet] 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) debug_args, command = browser_command(self.binary, args, self.debug_info)
self.command = command self.command = command
@ -199,8 +195,6 @@ class ServoRefTestExecutor(ProcessTestExecutor):
"--output=%s" % output_path, full_url] "--output=%s" % output_path, full_url]
for stylesheet in self.browser.user_stylesheets: for stylesheet in self.browser.user_stylesheets:
self.command += ["--user-stylesheet", stylesheet] self.command += ["--user-stylesheet", stylesheet]
for pref in test.environment.get('prefs', {}):
self.command += ["--pref", pref]
env = os.environ.copy() env = os.environ.copy()
env["HOST_FILE"] = self.hosts_path env["HOST_FILE"] = self.hosts_path

9
tests/wpt/metadata-css/__dir__.ini
View file

@ -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"]