Fix wrong compiletest filters on Windows#100811
Merged
bors merged 1 commit intorust-lang:masterfrom Aug 27, 2022
czzrr:master
Merged
Fix wrong compiletest filters on Windows#100811bors merged 1 commit intorust-lang:masterfrom czzrr:master
bors merged 1 commit intorust-lang:masterfrom
czzrr:master
Conversation
rustbot
added
the
T-bootstrap
Contributor
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
Member
|
I don't think we need a test here, so this seems okay. That said, I am curious why compiletest collection and the path produced by bootstrap differ - maybe we should be trying to fix that? |
Contributor
Author
|
By "path produced by bootstrap", do you in this case mean |
This comment has been minimized.
This comment has been minimized.
Member
|
Yeah, I guess this is a symptom of our "magic" test-args generation biting us; the paths under the hood are just represented as Strings, which don't normalize the way Path/PathBuf would in this case on equality. r=me with commits squashed @rustbot author |
rustbot
added
S-waiting-on-author
Contributor
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Aug 23, 2022
Fix wrong compiletest filters on Windows As discussed in [rust-lang#79334](rust-lang#79334), when calling e.g. ``` python x.py test src/test/ui/expr/compound-assignment/eval-order.rs ``` on Windows, compiletest passes the filter `expr/compound-assignment/eval-order.rs` to libtest, which instead should be `expr\compound-assignment\eval-order.rs`, as that is the file found when collecting tests. This is what I fixed. I'm not sure how to organize a test for this. Any suggestions?
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Aug 24, 2022
Fix wrong compiletest filters on Windows As discussed in [rust-lang#79334](rust-lang#79334), when calling e.g. ``` python x.py test src/test/ui/expr/compound-assignment/eval-order.rs ``` on Windows, compiletest passes the filter `expr/compound-assignment/eval-order.rs` to libtest, which instead should be `expr\compound-assignment\eval-order.rs`, as that is the file found when collecting tests. This is what I fixed. I'm not sure how to organize a test for this. Any suggestions?
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 24, 2022
Fix wrong compiletest filters on Windows As discussed in [rust-lang#79334](rust-lang#79334), when calling e.g. ``` python x.py test src/test/ui/expr/compound-assignment/eval-order.rs ``` on Windows, compiletest passes the filter `expr/compound-assignment/eval-order.rs` to libtest, which instead should be `expr\compound-assignment\eval-order.rs`, as that is the file found when collecting tests. This is what I fixed. I'm not sure how to organize a test for this. Any suggestions?
Member
|
@bors rollup=iffy #100947 (comment) |
rustbot
added
the
T-compiler
Contributor
|
rustbot should really write something if r+ PR was changed afterwards. |
This comment has been minimized.
This comment has been minimized.
Contributor
Author
|
That was a totally unrelated commit, my bad... |
rustbot
added
the
S-waiting-on-review
Member
|
@bors r+ rollup I don't think this PR was the cause of the hang -- I think that's just a more general issue we're seeing in CI (as yet undiagnosed). |
Collaborator
bors
removed
the
S-waiting-on-review
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
Aug 27, 2022
Fix wrong compiletest filters on Windows As discussed in [rust-lang#79334](rust-lang#79334), when calling e.g. ``` python x.py test src/test/ui/expr/compound-assignment/eval-order.rs ``` on Windows, compiletest passes the filter `expr/compound-assignment/eval-order.rs` to libtest, which instead should be `expr\compound-assignment\eval-order.rs`, as that is the file found when collecting tests. This is what I fixed. I'm not sure how to organize a test for this. Any suggestions?
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 27, 2022
Rollup of 11 pull requests Successful merges: - rust-lang#96240 (Stabilize `const_ptr_offset_from`.) - rust-lang#99784 (Make forward compatibility lint deprecated_cfg_attr_crate_type_name deny by default) - rust-lang#100811 (Fix wrong compiletest filters on Windows) - rust-lang#100924 (Smaller improvements of tidy and the unicode generator) - rust-lang#100953 (Update documentation for `write!` and `writeln!`) - rust-lang#101018 (rustdoc: omit start/end tags for empty item description blocks) - rust-lang#101044 (rustdoc: remove unused CSS for `hidden-by-*-hider`) - rust-lang#101046 (rustdoc: remove incorrect CSS selector `.impl-items table td`) - rust-lang#101057 (Merge implementations of HIR fn_decl and fn_sig.) - rust-lang#101062 (rustdoc: remove empty extern_crates and type="text/javascript" on script) - rust-lang#101063 (Merge duplicated CSS rules) Failed merges: - rust-lang#101055 (Use smaller span for suggestions) 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
9 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.
As discussed in #79334, when calling e.g.
on Windows, compiletest passes the filter
expr/compound-assignment/eval-order.rsto libtest, which instead should beexpr\compound-assignment\eval-order.rs, as that is the file found when collecting tests. This is what I fixed.I'm not sure how to organize a test for this. Any suggestions?