Allow revisions for compile-time stdin, just like with runtime stdin

oli-obk · Sep 16, 2023 · 3d262a2 · 3d262a2
1 parent 8ed1b5e
commit 3d262a2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.21.0"
+version = "0.21.1"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"

diff --git a/src/lib.rs b/src/lib.rs
@@ -637,7 +637,11 @@ impl dyn TestStatus {
 
         let mut cmd = build_command(path, &config, revision, comments)?;
         cmd.args(&extra_args);
-        let stdin = path.with_extension("stdin");
+        let stdin = path.with_extension(if revision.is_empty() {
+            "stdin".into()
+        } else {
+            format!("{revision}.stdin")
+        });
         if stdin.exists() {
             cmd.stdin(std::fs::File::open(stdin).unwrap());
         }

diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock
diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock
diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock
diff --git a/tests/integrations/basic/Cargo.lock b/tests/integrations/basic/Cargo.lock
diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock