From 27893ddac516e7beac952ce0f73127964578d11c Mon Sep 17 00:00:00 2001
From: Bram van den Heuvel <bram@vandenheuvel.online>
Date: Thu, 4 Nov 2021 10:57:42 +0100
Subject: [PATCH] Group commandline tests in a directory

---
 .../{ => commandline-argfile}/commandline-argfile-badutf8.args  | 0
 .../{ => commandline-argfile}/commandline-argfile-badutf8.rs    | 2 +-
 .../commandline-argfile-badutf8.stderr                          | 0
 .../commandline-argfile}/commandline-argfile-missing.rs         | 2 +-
 .../commandline-argfile-missing.stderr                          | 0
 .../{ => commandline-argfile}/commandline-argfile.args          | 0
 .../rustdoc-ui/{ => commandline-argfile}/commandline-argfile.rs | 2 +-
 .../ui/{ => command/argfile}/commandline-argfile-badutf8.args   | 0
 .../ui/{ => command/argfile}/commandline-argfile-badutf8.rs     | 2 +-
 .../ui/{ => command/argfile}/commandline-argfile-badutf8.stderr | 0
 .../command/argfile}/commandline-argfile-missing.rs             | 2 +-
 .../ui/{ => command/argfile}/commandline-argfile-missing.stderr | 0
 src/test/ui/{ => command/argfile}/commandline-argfile.args      | 0
 src/test/ui/{ => command/argfile}/commandline-argfile.rs        | 2 +-
 src/test/ui/{ => command}/command-line-diagnostics.rs           | 0
 src/test/ui/{ => command}/command-line-diagnostics.stderr       | 0
 16 files changed, 6 insertions(+), 6 deletions(-)
 rename src/test/rustdoc-ui/{ => commandline-argfile}/commandline-argfile-badutf8.args (100%)
 rename src/test/rustdoc-ui/{ => commandline-argfile}/commandline-argfile-badutf8.rs (87%)
 rename src/test/rustdoc-ui/{ => commandline-argfile}/commandline-argfile-badutf8.stderr (100%)
 rename src/test/{ui => rustdoc-ui/commandline-argfile}/commandline-argfile-missing.rs (92%)
 rename src/test/rustdoc-ui/{ => commandline-argfile}/commandline-argfile-missing.stderr (100%)
 rename src/test/rustdoc-ui/{ => commandline-argfile}/commandline-argfile.args (100%)
 rename src/test/rustdoc-ui/{ => commandline-argfile}/commandline-argfile.rs (90%)
 rename src/test/ui/{ => command/argfile}/commandline-argfile-badutf8.args (100%)
 rename src/test/ui/{ => command/argfile}/commandline-argfile-badutf8.rs (67%)
 rename src/test/ui/{ => command/argfile}/commandline-argfile-badutf8.stderr (100%)
 rename src/test/{rustdoc-ui => ui/command/argfile}/commandline-argfile-missing.rs (79%)
 rename src/test/ui/{ => command/argfile}/commandline-argfile-missing.stderr (100%)
 rename src/test/ui/{ => command/argfile}/commandline-argfile.args (100%)
 rename src/test/ui/{ => command/argfile}/commandline-argfile.rs (70%)
 rename src/test/ui/{ => command}/command-line-diagnostics.rs (100%)
 rename src/test/ui/{ => command}/command-line-diagnostics.stderr (100%)

diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.args b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.args
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile-badutf8.args
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.args
diff --git a/src/test/rustdoc-ui/commandline-argfile-badutf8.rs b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.rs
similarity index 87%
rename from src/test/rustdoc-ui/commandline-argfile-badutf8.rs
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.rs
index e2984e3ca97ac..19e5dfb619c21 100644
--- a/src/test/rustdoc-ui/commandline-argfile-badutf8.rs
+++ b/src/test/rustdoc-ui/commandline-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/src/test/rustdoc-ui/commandline-argfile-badutf8.stderr b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.stderr
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile-badutf8.stderr
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-badutf8.stderr
diff --git a/src/test/ui/commandline-argfile-missing.rs b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.rs
similarity index 92%
rename from src/test/ui/commandline-argfile-missing.rs
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.rs
index 5a6465bd06469..e48e74cd9eed3 100644
--- a/src/test/ui/commandline-argfile-missing.rs
+++ b/src/test/rustdoc-ui/commandline-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/src/test/rustdoc-ui/commandline-argfile-missing.stderr b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.stderr
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile-missing.stderr
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile-missing.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile.args b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile.args
similarity index 100%
rename from src/test/rustdoc-ui/commandline-argfile.args
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile.args
diff --git a/src/test/rustdoc-ui/commandline-argfile.rs b/src/test/rustdoc-ui/commandline-argfile/commandline-argfile.rs
similarity index 90%
rename from src/test/rustdoc-ui/commandline-argfile.rs
rename to src/test/rustdoc-ui/commandline-argfile/commandline-argfile.rs
index cc8c8722c1c35..16184665d9e6d 100644
--- a/src/test/rustdoc-ui/commandline-argfile.rs
+++ b/src/test/rustdoc-ui/commandline-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 b/src/test/ui/command/argfile/commandline-argfile-badutf8.args
similarity index 100%
rename from src/test/ui/commandline-argfile-badutf8.args
rename to src/test/ui/command/argfile/commandline-argfile-badutf8.args
diff --git a/src/test/ui/commandline-argfile-badutf8.rs b/src/test/ui/command/argfile/commandline-argfile-badutf8.rs
similarity index 67%
rename from src/test/ui/commandline-argfile-badutf8.rs
rename to src/test/ui/command/argfile/commandline-argfile-badutf8.rs
index e2984e3ca97ac..0e7407e2e2079 100644
--- a/src/test/ui/commandline-argfile-badutf8.rs
+++ b/src/test/ui/command/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/src/test/ui/commandline-argfile-badutf8.stderr b/src/test/ui/command/argfile/commandline-argfile-badutf8.stderr
similarity index 100%
rename from src/test/ui/commandline-argfile-badutf8.stderr
rename to src/test/ui/command/argfile/commandline-argfile-badutf8.stderr
diff --git a/src/test/rustdoc-ui/commandline-argfile-missing.rs b/src/test/ui/command/argfile/commandline-argfile-missing.rs
similarity index 79%
rename from src/test/rustdoc-ui/commandline-argfile-missing.rs
rename to src/test/ui/command/argfile/commandline-argfile-missing.rs
index 5a6465bd06469..1cdead6f8e757 100644
--- a/src/test/rustdoc-ui/commandline-argfile-missing.rs
+++ b/src/test/ui/command/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/src/test/ui/commandline-argfile-missing.stderr b/src/test/ui/command/argfile/commandline-argfile-missing.stderr
similarity index 100%
rename from src/test/ui/commandline-argfile-missing.stderr
rename to src/test/ui/command/argfile/commandline-argfile-missing.stderr
diff --git a/src/test/ui/commandline-argfile.args b/src/test/ui/command/argfile/commandline-argfile.args
similarity index 100%
rename from src/test/ui/commandline-argfile.args
rename to src/test/ui/command/argfile/commandline-argfile.args
diff --git a/src/test/ui/commandline-argfile.rs b/src/test/ui/command/argfile/commandline-argfile.rs
similarity index 70%
rename from src/test/ui/commandline-argfile.rs
rename to src/test/ui/command/argfile/commandline-argfile.rs
index fc1ba0c8d677d..40b8265cdecc9 100644
--- a/src/test/ui/commandline-argfile.rs
+++ b/src/test/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 b/src/test/ui/command/command-line-diagnostics.rs
similarity index 100%
rename from src/test/ui/command-line-diagnostics.rs
rename to src/test/ui/command/command-line-diagnostics.rs
diff --git a/src/test/ui/command-line-diagnostics.stderr b/src/test/ui/command/command-line-diagnostics.stderr
similarity index 100%
rename from src/test/ui/command-line-diagnostics.stderr
rename to src/test/ui/command/command-line-diagnostics.stderr