Mach test cargo target dir #27169
Merged
Mach test cargo target dir #27169
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @jdm (or someone else) soon. |
|
Heads up! This PR modifies the following files:
|
|
Woops, didn't create the branch from master. Let me rebase this. |
alarsyo
force-pushed
the
mach-test-cargo-target-dir
branch
from
aad0de3
to
bcd6ef8
Compare
|
@bors-servo r+ |
|
|
bors-servo
added a commit
that referenced
this issue
Jul 3, 2020
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`.
|
|
jdm
reviewed
Jul 3, 2020
tests/wpt/run.py
Outdated
| @@ -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 os.environ["CARGO_TARGET_DIR"]: | |||
There was a problem hiding this comment.
Looks like we need os.environ.get("CARGO_TARGET_DIR") instead.
There was a problem hiding this comment.
My bad, didn't test without the variable :) should be fixed!
alarsyo
force-pushed
the
mach-test-cargo-target-dir
branch
from
bcd6ef8
to
9f224c4
Compare
|
@bors-servo r+ |
|
|
bors-servo
added a commit
that referenced
this issue
Jul 3, 2020
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`.
|
|
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change allows launching tests this way:
The build and check commands already check for the presence of the
CARGO_TARGET_DIRvariable, but that wasn't the case for wpt tests. This resulted in an error about theservoexecutable not being found intarget/debug/servo.