Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16917 - glennw:update-wr-bugs, r=emilio

Browse source 
Update WR (Intel driver workaround, subpixel and other bugfixes).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16917)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-22 07:00:39 -05:00 • committed by GitHub
commit e91ffafd82
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3298,7 +3298,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.39.0" version = "0.39.0"
source = "git+https://github.com/servo/webrender#4ab9b9b00b00c93a51469775f56c53eeea68b5ab" source = "git+https://github.com/servo/webrender#c003d553bdd856e1e78d213375582a1f2b091a06"
dependencies = [ dependencies = [
"app_units 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3327,7 +3327,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_traits" name = "webrender_traits"
version = "0.39.0" version = "0.39.0"
source = "git+https://github.com/servo/webrender#4ab9b9b00b00c93a51469775f56c53eeea68b5ab" source = "git+https://github.com/servo/webrender#c003d553bdd856e1e78d213375582a1f2b091a06"
dependencies = [ dependencies = [
"app_units 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",

8
python/servo/testing_commands.py
View file

@ -458,6 +458,14 @@ class MachCommands(CommandBase):
def wptrunner(self, run_file, **kwargs): def wptrunner(self, run_file, **kwargs):
self.set_software_rendering_env(kwargs['release']) self.set_software_rendering_env(kwargs['release'])
# By default, Rayon selects the number of worker threads
# based on the available CPU count. This doesn't work very
# well when running tests on CI, since we run so many
# Servo processes in parallel. The result is a lot of
# extra timeouts. Instead, force Rayon to assume we are
# running on a 2 CPU environment.
os.environ['RAYON_RS_NUM_CPUS'] = "2"
os.environ["RUST_BACKTRACE"] = "1" os.environ["RUST_BACKTRACE"] = "1"
kwargs["debug"] = not kwargs["release"] kwargs["debug"] = not kwargs["release"]
if kwargs.pop("chaos"): if kwargs.pop("chaos"):