Skip to content

Commit 12d87ee

Browse files
committed
file_stem and comment per notriddle
1 parent f6f0ef4 commit 12d87ee

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

src/tools/compiletest/src/runtest.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -1610,6 +1610,8 @@ impl<'test> TestCx<'test> {
16101610
};
16111611
// Create the directory for the stdout/stderr files.
16121612
create_dir_all(aux_cx.output_base_dir()).unwrap();
1613+
// use root_testpaths here, because aux-builds should have the
1614+
// same --out-dir and auxiliary directory.
16131615
let auxres = aux_cx.document(&root_out_dir, root_testpaths);
16141616
if !auxres.status.success() {
16151617
return auxres;
@@ -1624,14 +1626,7 @@ impl<'test> TestCx<'test> {
16241626
// actual --out-dir given to the auxiliary or test, as opposed to the root out dir for the entire
16251627
// test
16261628
let out_dir: Cow<'_, Path> = if self.props.unique_doc_out_dir {
1627-
let file_name = self
1628-
.testpaths
1629-
.file
1630-
.file_name()
1631-
.expect("file name should not be empty")
1632-
.to_str()
1633-
.expect("file name utf8")
1634-
.trim_end_matches(".rs");
1629+
let file_name = self.testpaths.file.file_stem().expect("file name should not be empty");
16351630
let out_dir = PathBuf::from_iter([
16361631
root_out_dir,
16371632
Path::new("docs"),

0 commit comments

Comments
 (0)