aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2023-05-29 10:09:54 +0200
committerMartin Robinson <mrobinson@igalia.com>2023-05-29 10:09:54 +0200
commit4d8c227774d21e76937c05e148e4007921448dad (patch)
tree085ef262a8799222ed1be5a19dcca819ebdbb88b /python
parent7d50362c72b86eaface602cfa52827c84b8f9bdd (diff)
downloadservo-4d8c227774d21e76937c05e148e4007921448dad.tar.gz
servo-4d8c227774d21e76937c05e148e4007921448dad.zip
Do not pass features when running `./mach test-unit`
Diffstat (limited to 'python')
-rw-r--r--python/servo/command_base.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 2b5d47c90bd..0d2e794eba7 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -876,8 +876,8 @@ class CommandBase(object):
if self.cross_compile_target:
args += ["--target", self.cross_compile_target]
- features = list(self.features)
if "-p" not in cargo_args: # We're building specific package, that may not have features
+ features = list(self.features)
if self.config["build"]["debug-mozjs"] or debug_mozjs:
features.append("debugmozjs")
@@ -902,12 +902,11 @@ class CommandBase(object):
features.append("webgl-backtrace")
if self.config["build"]["dom-backtrace"]:
features.append("dom-backtrace")
+ args += ["--features", " ".join(features)]
+
if with_debug_assertions or self.config["build"]["debug-assertions"]:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions"
- assert "--features" not in cargo_args
- args += ["--features", " ".join(features)]
-
if self.is_uwp_build:
cargo_args += ["-Z", "build-std"]
return self.call_rustup_run(["cargo", command] + args + cargo_args, env=env, verbose=verbose)