mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
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. -->
This commit is contained in:
commit
9a93c21867
1 changed files with 3 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue