aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-05-29 11:14:06 +0200
committerGitHub <noreply@github.com>2023-05-29 11:14:06 +0200
commit9a93c218675374eb4d57fa2d55f1bdadb831ac8d (patch)
tree085ef262a8799222ed1be5a19dcca819ebdbb88b /python/servo
parent7d50362c72b86eaface602cfa52827c84b8f9bdd (diff)
parent4d8c227774d21e76937c05e148e4007921448dad (diff)
downloadservo-9a93c218675374eb4d57fa2d55f1bdadb831ac8d.tar.gz
servo-9a93c218675374eb4d57fa2d55f1bdadb831ac8d.zip
Auto merge of #29808 - mrobinson:no-features-for-test-unit, r=atbrakhi
Do not pass features when running `./mach test-unit` <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes. They fix running the tests. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python/servo')
-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)