mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Auto merge of #27169 - alarsyo:mach-test-cargo-target-dir, r=jdm
Mach test cargo target dir <!-- 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 <!-- Either: --> - [X] These changes do not require tests because they're about tooling <!-- 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 change allows launching tests this way: ```sh CARGO_TARGET_DIR=other-dir ./mach test-wpt ... ``` The build and check commands already check for the presence of the `CARGO_TARGET_DIR` variable, but that wasn't the case for wpt tests. This resulted in an error about the `servo` executable not being found in `target/debug/servo`.
This commit is contained in:
commit
026760a17b
1 changed files with 5 additions and 1 deletions
|
@ -4,6 +4,7 @@
|
|||
|
||||
import multiprocessing
|
||||
import os
|
||||
from os import path
|
||||
import sys
|
||||
import mozlog
|
||||
import grouping_formatter
|
||||
|
@ -72,7 +73,10 @@ def set_defaults(kwargs):
|
|||
bin_name = "servo"
|
||||
if sys.platform == "win32":
|
||||
bin_name += ".exe"
|
||||
bin_path = servo_path("target", bin_dir, bin_name)
|
||||
if "CARGO_TARGET_DIR" in os.environ:
|
||||
bin_path = path.join(os.environ["CARGO_TARGET_DIR"], bin_dir, bin_name)
|
||||
else:
|
||||
bin_path = servo_path("target", bin_dir, bin_name)
|
||||
|
||||
kwargs["binary"] = bin_path
|
||||
kwargs["webdriver_binary"] = bin_path
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue