From 042e1e027974eadc164b875b4a0ab197dd9988cb Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Fri, 20 Apr 2018 16:11:05 +0200 Subject: [PATCH] Fix #50113: must explicitly request file name when using with_file_name. --- src/tools/compiletest/src/runtest.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index c16dbd0272a76..0f4d247633a61 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2880,8 +2880,10 @@ impl<'test> TestCx<'test> { } } - let expected_output_path = self.expected_output_path(kind); - let output_file = self.output_base_name().with_file_name(&expected_output_path); + let expected_output = self.expected_output_path(kind); + // #50113: output is abspath; only want filename component. + let expected_output = expected_output.file_name().expect("output path requires file name"); + let output_file = self.output_base_name().with_file_name(&expected_output); match File::create(&output_file).and_then(|mut f| f.write_all(actual.as_bytes())) { Ok(()) => {} Err(e) => self.fatal(&format!(