Fix the tests-listing-format-json test on Windows#112295
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 6, 2023
Merged
Fix the tests-listing-format-json test on Windows#112295bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @wesleywiser (or someone else) soon. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
rustbot
added
A-testsuite
Contributor
Author
Member
|
@bors r+ |
Collaborator
|
📌 Commit f301b3850bcc88db2632593e340da5433f90ac10 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Contributor
Member
|
@bors r- Could you remove the merge commits? |
bors
added
S-waiting-on-author
ForrestOfBarnes
force-pushed
the
tests-listing-format-json-windows-fix
branch
from
f301b38 to
ec18a34
Compare
Contributor
Author
|
@rustbot label -S-waiting-on-author +S-waiting-on-review |
rustbot
added
S-waiting-on-review
Member
|
Sorry for the delay! @bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 6, 2023
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#112295 (Fix the tests-listing-format-json test on Windows) - rust-lang#113246 (fix compiletest crash) - rust-lang#113395 (Dont ICE for `dyn* Trait: Trait` (built-in object) goals during selection in new trait solver) - rust-lang#113402 (Diagnose unsorted CGUs.) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.Suggestion cannot be applied right now. Please check back later.
tests/ui/test-attrs/tests-listing-json-format.rs was failing on Windows because each path in the json-formatted output contained "\\" instead of "\".
runtest::TestCx::normalize_outputalready checks the compile flags for json-related arguments to handle this case, so I added an equivalent check for the new run flag.