Skip to content

Commit 0576445

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #90560 - vandenheuvel:commandline_argfile_tests, r=wesleywiser
Group commandline tests in a directory I grouped the `ui/command*` tests in `ui/command/argfile/` and `rustdoc-ui/command*` in `rustdoc-ui/commandline-argfile/`.
2 parents d212d90 + 27893dd commit 0576445

16 files changed

+6
-6
lines changed

‎src/test/rustdoc-ui/commandline-argfile-badutf8.args renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.args

File renamed without changes.

‎src/test/rustdoc-ui/commandline-argfile-badutf8.rs renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Check to see if we can get parameters from an @argsfile file
22
//
3-
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
3+
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile-badutf8.args
44

55
#[cfg(not(cmdline_set))]
66
compile_error!("cmdline_set not set");

‎src/test/rustdoc-ui/commandline-argfile-badutf8.stderr renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.stderr

File renamed without changes.

‎src/test/ui/commandline-argfile-missing.rs renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// normalize-stderr-test: "os error \d+" -> "os error $$ERR"
44
// normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
5-
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args
5+
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile-missing.args
66

77
#[cfg(not(cmdline_set))]
88
compile_error!("cmdline_set not set");

‎src/test/rustdoc-ui/commandline-argfile-missing.stderr renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.stderr

File renamed without changes.

‎src/test/rustdoc-ui/commandline-argfile.args renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile.args

File renamed without changes.

‎src/test/rustdoc-ui/commandline-argfile.rs renamed to ‎src/test/rustdoc-ui/commandline-argfile/commandline-argfile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Check to see if we can get parameters from an @argsfile file
22
//
33
// check-pass
4-
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile.args
4+
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile.args
55

66
#[cfg(not(cmdline_set))]
77
compile_error!("cmdline_set not set");

‎src/test/ui/commandline-argfile-badutf8.args renamed to ‎src/test/ui/command/argfile/commandline-argfile-badutf8.args

File renamed without changes.

‎src/test/ui/commandline-argfile-badutf8.rs renamed to ‎src/test/ui/command/argfile/commandline-argfile-badutf8.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Check to see if we can get parameters from an @argsfile file
22
//
3-
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
3+
// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile-badutf8.args
44

55
#[cfg(not(cmdline_set))]
66
compile_error!("cmdline_set not set");

‎src/test/ui/commandline-argfile-badutf8.stderr renamed to ‎src/test/ui/command/argfile/commandline-argfile-badutf8.stderr

File renamed without changes.

‎src/test/rustdoc-ui/commandline-argfile-missing.rs renamed to ‎src/test/ui/command/argfile/commandline-argfile-missing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// normalize-stderr-test: "os error \d+" -> "os error $$ERR"
44
// normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
5-
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args
5+
// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile-missing.args
66

77
#[cfg(not(cmdline_set))]
88
compile_error!("cmdline_set not set");

‎src/test/ui/commandline-argfile-missing.stderr renamed to ‎src/test/ui/command/argfile/commandline-argfile-missing.stderr

File renamed without changes.

‎src/test/ui/commandline-argfile.args renamed to ‎src/test/ui/command/argfile/commandline-argfile.args

File renamed without changes.

‎src/test/ui/commandline-argfile.rs renamed to ‎src/test/ui/command/argfile/commandline-argfile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Check to see if we can get parameters from an @argsfile file
22
//
33
// build-pass
4-
// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile.args
4+
// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile.args
55

66
#[cfg(not(cmdline_set))]
77
compile_error!("cmdline_set not set");

‎src/test/ui/command-line-diagnostics.rs renamed to ‎src/test/ui/command/command-line-diagnostics.rs

File renamed without changes.

‎src/test/ui/command-line-diagnostics.stderr renamed to ‎src/test/ui/command/command-line-diagnostics.stderr

File renamed without changes.

0 commit comments

Comments
 (0)