diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-07-04 14:24:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 14:24:38 -0400 |
| commit | 5f477707a1ec863aea7868299b960e86582382bc (patch) | |
| tree | ce3cf6192e14eb32ce516ba4d422eb2de52eed91 /python/servo | |
| parent | ed9204968a40d08d02625f6a9543d4de6b900870 (diff) | |
| parent | 5cabcd5268a802b807a9f876c472b83467d3c093 (diff) | |
| download | servo-5f477707a1ec863aea7868299b960e86582382bc.tar.gz servo-5f477707a1ec863aea7868299b960e86582382bc.zip | |
Auto merge of #23646 - servo:layout-2020, r=jdm
Add `./mach build --features layout-2020`
… with corresponding `layout` and `layout_thread` crates, which for now do nothing.
<!-- 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/23646)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 7 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 265d2814eb6..46f9f6e5ad3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -788,6 +788,7 @@ install them, let us know by filing a bug!") action='store_true', help='Build for HoloLens (x64)'), CommandArgument('--with-raqote', default=None, action='store_true'), + CommandArgument('--with-layout-2020', default=None, action='store_true'), CommandArgument('--without-wgl', default=None, action='store_true'), ] @@ -813,7 +814,7 @@ install them, let us know by filing a bug!") env=None, verbose=False, target=None, android=False, magicleap=False, libsimpleservo=False, features=None, debug_mozjs=False, with_debug_assertions=False, - with_frame_pointer=False, with_raqote=False, without_wgl=False, + with_frame_pointer=False, with_raqote=False, with_layout_2020=False, without_wgl=False, uwp=False, ): env = env or self.build_env() @@ -852,6 +853,10 @@ install them, let us know by filing a bug!") features.append("canvas2d-raqote") elif "canvas2d-raqote" not in features: features.append("canvas2d-azure") + if with_layout_2020 and "layout-2013" not in features: + features.append("layout-2020") + elif "layout-2020" not in features: + features.append("layout-2013") if with_frame_pointer: env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes" features.append("profilemozjs") diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index d1880f6385e..6aeb176c040 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -72,6 +72,8 @@ def create_parser_wpt(): help="Run under chaos mode in rr until a failure is captured") parser.add_argument('--pref', default=[], action="append", dest="prefs", help="Pass preferences to servo") + parser.add_argument('--layout-2020', default=False, action="store_true", + help="Use expected results for the 2020 layout engine") parser.add_argument('--always-succeed', default=False, action="store_true", help="Always yield exit code of zero") return parser @@ -248,7 +250,7 @@ class MachCommands(CommandBase): self_contained_tests = [ "background_hang_monitor", "gfx", - "layout", + "layout_2013", "msg", "net", "net_traits", |