Add support for shell argfiles

[djkoloski]

Closes rust-lang/compiler-team#684

[rustbot]

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

[rustbot]

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

[rustbot]

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

[djkoloski]

Tidy is mad about tests/ui containing too many tests, but I put my tests in a subdirectory. This PR is ready for review.

[compiler-errors]

Tidy is mad about tests/ui containing too many tests, but I put my tests in a subdirectory.

You still need to fix tidy. Change the limits in src/tools/tidy/src/ui_tests.rs.

[djkoloski]

Thanks @compiler-errors, should be good to go now

[Noratrieb]

Another option would be to remove the unstable flag and gate this behind -Zunstable-options instead. I'm not sure what's better.

[compiler-errors]

@rustbot author

[matthiaskrgr]

@bors r-
looks like this failed in #119630 (comment)

[compiler-errors]

- error: Failed to load argument file: Invalid shell-style arguments in $DIR/shell-argfiles-badquotes.args
+ error: Failed to load argument file: Invalid shell-style arguments in C:\a\rust\rust\tests\ui/shell-argfiles/shell-argfiles-badquotes.args

[djkoloski]

Hmm looks like something funny is going on on windows. I'm attempting a repro.

[djkoloski]

It looks like the underlying issue is that the shell-argfiles-badquotes.rs test is passing @shell:{{src-base}}/shell-argfiles/shell-argfiles-badquotes.args as an argument. On Windows, this path resolves to C:\some\path\with\backslashes\ui/shell-argfiles/shell-argfiles-badquotes.args. This path gets emitted verbatim in the error message.

In runtest.rs, the path normalization method replaces self.testpaths.file.parent() with $DIR in the output. This path will be target-specific, and on Windows it will be C:\some\path\with\backslashes\ui\shell-argfiles. Because it's a simple string replace, the final backslash after ui causes it not to match, and so is compared verbatim with the .stderr file.

A quick search through the other tests in tests doesn't turn up any other tests which 1. are located in a subdirectory of ui, 2. pass a file via the command line, and 3. are intended to fail with a .stderr file to compare against. So this is the only test affected.

I'll see if I can canonicalize the path before emitting it in the shell argfiles diagnostic. If there's no easy way to do that, I'll take a crack at changing the behavior of $DIR replacement in runtest.rs.

[djkoloski]

@rustbot ready

I have verified that this change fixes the failing windows test.

[djkoloski]

An alternative to adding {{sep}} would be to move these tests up out of a subdirectory. That would avoid the underlying issue.

[djkoloski]

@rustbot ready

[compiler-errors]

This could have used revisions:

// revisions: windows nonwindows
//[windows] only-windows
//[windows] compile-flags: \back\slashes
//[nonwindows] ignore-windows
//[nonwindows] compile-flags: /fwd/slashes

[compiler-errors]

but whatever

@bors r+

[bors]

📌 Commit 684aa2c has been approved by compiler-errors

It is now in the queue for this repository.

[djkoloski]

I'd be happy to file a follow-up PR to clean the test up! And thanks for bearing with me while I continue to learn the ropes. ❤️