about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorZalathar <Zalathar@users.noreply.github.com>2024-06-07 15:55:08 +1000
committerZalathar <Zalathar@users.noreply.github.com>2024-06-07 15:55:36 +1000
commit58ba77f4aa46ca94f643eebe8f61a44f56c8abd5 (patch)
tree214c7464df63c2fdc90d8fb9929a86af9275caa9 /src/tools/compiletest
parent76e7a0849c07d73e4d9afde8036ee8c450127cc8 (diff)
downloadrust-58ba77f4aa46ca94f643eebe8f61a44f56c8abd5.tar.gz
rust-58ba77f4aa46ca94f643eebe8f61a44f56c8abd5.zip
compiletest: Don't pass `--out-dir` if the compile flags include `-o`
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/runtest.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 2c425a07b2a..a7511a6f457 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2254,6 +2254,9 @@ impl<'test> TestCx<'test> {
         }
 
         match output_file {
+            // If the test's compile flags specify an output path with `-o`,
+            // avoid a compiler warning about `--out-dir` being ignored.
+            _ if self.props.compile_flags.iter().any(|flag| flag == "-o") => {}
             TargetLocation::ThisFile(path) => {
                 rustc.arg("-o").arg(path);
             }