about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-04-29 09:14:09 +0000
committerbors <bors@rust-lang.org>2024-04-29 09:14:09 +0000
commit90846015cc99aa90290c1f4ee95c571fff6901ef (patch)
treee584828acc93919054ec9f103f22811723282626
parentc65b2dc935c27c0c8c3997c6e8d8894718a2cb1a (diff)
parentde3eff79a6456aa3f31e37123e73ef713d00f781 (diff)
Auto merge of #124505 - Enselic:aux-bin-fix, r=jieyouxu
aux-bin: Avoid old .so files from old tests; clean auxiliary dir root

Also fix the typo pointed out [here](https://github.com/rust-lang/rust/pull/123316/files#r1577081531).

Closes #124465
-rw-r--r--src/tools/compiletest/src/runtest.rs1
-rw-r--r--tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index b0f84b1162f..da51b33a9d6 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2140,6 +2140,7 @@ impl<'test> TestCx<'test> {
 
         if !self.props.aux_bins.is_empty() {
             let aux_bin_dir = self.aux_bin_output_dir_name();
+            remove_and_create_dir_all(&aux_dir);
             remove_and_create_dir_all(&aux_bin_dir);
         }
 
diff --git a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
index 694fa460e9b..3e63349edb7 100644
--- a/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
@@ -8,7 +8,7 @@
 
 extern crate libc;
 
-// By default the Rust runtime resets SIGPIPE to SIG_DFL before exec:ing child
+// By default the Rust runtime resets SIGPIPE to SIG_DFL before exec'ing child
 // processes so opt-out of that with `#[unix_sigpipe = "sig_dfl"]`. See
 // https://github.com/rust-lang/rust/blob/bf4de3a874753bbee3323081c8b0c133444fed2d/library/std/src/sys/pal/unix/process/process_unix.rs#L359-L384
 #[unix_sigpipe = "sig_dfl"]