Rollup merge of rust-lang#90560 - vandenheuvel:commandline_argfile_te…

…sts, 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/`.
matthiaskrgr · Nov 13, 2021 · 5f0cd0a · 5f0cd0a
2 parents a537bbf + 27893dd
commit 5f0cd0a
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 6 deletions.
diff --git a/...stdoc-ui/commandline-argfile-badutf8.args → ...-argfile/commandline-argfile-badutf8.args b/...stdoc-ui/commandline-argfile-badutf8.args → ...-argfile/commandline-argfile-badutf8.args
diff --git a/...rustdoc-ui/commandline-argfile-badutf8.rs → ...ne-argfile/commandline-argfile-badutf8.rs b/...rustdoc-ui/commandline-argfile-badutf8.rs → ...ne-argfile/commandline-argfile-badutf8.rs
@@ -1,6 +1,6 @@
 // Check to see if we can get parameters from an @argsfile file
 //
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile-badutf8.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");

diff --git a/...doc-ui/commandline-argfile-badutf8.stderr → ...rgfile/commandline-argfile-badutf8.stderr b/...doc-ui/commandline-argfile-badutf8.stderr → ...rgfile/commandline-argfile-badutf8.stderr
diff --git a/src/test/ui/commandline-argfile-missing.rs → ...ne-argfile/commandline-argfile-missing.rs b/src/test/ui/commandline-argfile-missing.rs → ...ne-argfile/commandline-argfile-missing.rs
@@ -2,7 +2,7 @@
 //
 // normalize-stderr-test: "os error \d+" -> "os error $$ERR"
 // normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile-missing.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");

diff --git a/...doc-ui/commandline-argfile-missing.stderr → ...rgfile/commandline-argfile-missing.stderr b/...doc-ui/commandline-argfile-missing.stderr → ...rgfile/commandline-argfile-missing.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile.args → ...mandline-argfile/commandline-argfile.args b/src/test/rustdoc-ui/commandline-argfile.args → ...mandline-argfile/commandline-argfile.args
diff --git a/src/test/rustdoc-ui/commandline-argfile.rs → ...ommandline-argfile/commandline-argfile.rs b/src/test/rustdoc-ui/commandline-argfile.rs → ...ommandline-argfile/commandline-argfile.rs
@@ -1,7 +1,7 @@
 // Check to see if we can get parameters from an @argsfile file
 //
 // check-pass
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile/commandline-argfile.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");

diff --git a/src/test/ui/commandline-argfile-badutf8.args → .../argfile/commandline-argfile-badutf8.args b/src/test/ui/commandline-argfile-badutf8.args → .../argfile/commandline-argfile-badutf8.args
diff --git a/src/test/ui/commandline-argfile-badutf8.rs → ...nd/argfile/commandline-argfile-badutf8.rs b/src/test/ui/commandline-argfile-badutf8.rs → ...nd/argfile/commandline-argfile-badutf8.rs
@@ -1,6 +1,6 @@
 // Check to see if we can get parameters from an @argsfile file
 //
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile-badutf8.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");

diff --git a/...est/ui/commandline-argfile-badutf8.stderr → ...rgfile/commandline-argfile-badutf8.stderr b/...est/ui/commandline-argfile-badutf8.stderr → ...rgfile/commandline-argfile-badutf8.stderr
diff --git a/...rustdoc-ui/commandline-argfile-missing.rs → ...nd/argfile/commandline-argfile-missing.rs b/...rustdoc-ui/commandline-argfile-missing.rs → ...nd/argfile/commandline-argfile-missing.rs
@@ -2,7 +2,7 @@
 //
 // normalize-stderr-test: "os error \d+" -> "os error $$ERR"
 // normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile-missing.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");

diff --git a/...est/ui/commandline-argfile-missing.stderr → ...rgfile/commandline-argfile-missing.stderr b/...est/ui/commandline-argfile-missing.stderr → ...rgfile/commandline-argfile-missing.stderr
diff --git a/src/test/ui/commandline-argfile.args → .../command/argfile/commandline-argfile.args b/src/test/ui/commandline-argfile.args → .../command/argfile/commandline-argfile.args
diff --git a/src/test/ui/commandline-argfile.rs → ...ui/command/argfile/commandline-argfile.rs b/src/test/ui/commandline-argfile.rs → ...ui/command/argfile/commandline-argfile.rs
@@ -1,7 +1,7 @@
 // Check to see if we can get parameters from an @argsfile file
 //
 // build-pass
-// compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile.args
+// compile-flags: --cfg cmdline_set @{{src-base}}/command/argfile/commandline-argfile.args
 
 #[cfg(not(cmdline_set))]
 compile_error!("cmdline_set not set");

diff --git a/src/test/ui/command-line-diagnostics.rs → ...st/ui/command/command-line-diagnostics.rs b/src/test/ui/command-line-diagnostics.rs → ...st/ui/command/command-line-diagnostics.rs
diff --git a/src/test/ui/command-line-diagnostics.stderr → ...i/command/command-line-diagnostics.stderr b/src/test/ui/command-line-diagnostics.stderr → ...i/command/command-line-diagnostics.stderr