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

Add --with-debug-assertions flag for Mach

Browse source
This commit is contained in:
Rohit Burra 2016-11-02 20:56:15 +05:30
parent 1192aaa14d
commit 76ec3f423a
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/ci/buildbot_steps.yml
View file

@ -55,15 +55,15 @@ linux-dev:
- bash ./etc/ci/check_no_panic.sh - bash ./etc/ci/check_no_panic.sh
linux-rel-wpt: linux-rel-wpt:
- ./mach build --release - ./mach build --release --with-debug-assertions
- ./mach test-wpt-failure - ./mach test-wpt-failure
- ./mach test-wpt --release --processes 24 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log - ./mach test-wpt --release --processes 24 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource - ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
linux-rel-css: linux-rel-css:
- ./mach build --release - ./mach build --release --with-debug-assertions
- ./mach test-css --release --processes 16 --log-raw test-css.log --log-errorsummary css-errorsummary.log - ./mach test-css --release --processes 16 --log-raw test-css.log --log-errorsummary css-errorsummary.log
- ./mach build-cef --release - ./mach build-cef --release --with-debug-assertions
- ./mach build-geckolib --release - ./mach build-geckolib --release
- ./mach test-stylo --release - ./mach test-stylo --release
- bash ./etc/ci/lockfile_changed.sh - bash ./etc/ci/lockfile_changed.sh

24
python/servo/build_commands.py
View file

@ -153,8 +153,13 @@ class MachCommands(CommandBase):
help='Print verbose output') help='Print verbose output')
@CommandArgument('params', nargs='...', @CommandArgument('params', nargs='...',
help="Command-line arguments to be passed through to Cargo") help="Command-line arguments to be passed through to Cargo")
@CommandArgument('--with-debug-assertions',
default=None,
action='store_true',
help='Enable debug assertions in release')
def build(self, target=None, release=False, dev=False, jobs=None, def build(self, target=None, release=False, dev=False, jobs=None,
features=None, android=None, verbose=False, debug_mozjs=False, params=None): features=None, android=None, verbose=False, debug_mozjs=False, params=None,
with_debug_assertions=False):
if android is None: if android is None:
android = self.config["build"]["android"] android = self.config["build"]["android"]
features = features or self.servo_features() features = features or self.servo_features()
@ -217,10 +222,7 @@ class MachCommands(CommandBase):
build_start = time() build_start = time()
env = self.build_env(target=target, is_build=True) env = self.build_env(target=target, is_build=True)
# TODO: If this ends up making it, we should probably add a if with_debug_assertions:
# --release-with-debug-assertions option or similar, so it's easier to
# build locally.
if env.get("SERVO_ENABLE_DEBUG_ASSERTIONS", None):
env["RUSTFLAGS"] = "-C debug_assertions" env["RUSTFLAGS"] = "-C debug_assertions"
if android: if android:
@ -339,7 +341,12 @@ class MachCommands(CommandBase):
@CommandArgument('--release', '-r', @CommandArgument('--release', '-r',
action='store_true', action='store_true',
help='Build in release mode') help='Build in release mode')
def build_cef(self, jobs=None, verbose=False, release=False): @CommandArgument('--with-debug-assertions',
default=None,
action='store_true',
help='Enable debug assertions in release')
def build_cef(self, jobs=None, verbose=False, release=False,
with_debug_assertions=False):
self.ensure_bootstrapped() self.ensure_bootstrapped()
ret = None ret = None
@ -358,10 +365,7 @@ class MachCommands(CommandBase):
build_start = time() build_start = time()
env = self.build_env(is_build=True) env = self.build_env(is_build=True)
# TODO: If this ends up making it, we should probably add a if with_debug_assertions:
# --release-with-debug-assertions option or similar, so it's easier to
# build locally.
if env.get("SERVO_ENABLE_DEBUG_ASSERTIONS", None):
env["RUSTFLAGS"] = "-C debug_assertions" env["RUSTFLAGS"] = "-C debug_assertions"
with cd(path.join("ports", "cef")): with cd(path.join("ports", "cef")):