Skip to content

Commit 6516b64

Browse files
committed
file_stem and comment per notriddle
1 parent e3d2d9b commit 6516b64

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
@@ -1607,6 +1607,8 @@ impl<'test> TestCx<'test> {
16071607
};
16081608
// Create the directory for the stdout/stderr files.
16091609
create_dir_all(aux_cx.output_base_dir()).unwrap();
1610+
// use root_testpaths here, because aux-builds should have the
1611+
// same --out-dir and auxiliary directory.
16101612
let auxres = aux_cx.document(&root_out_dir, root_testpaths);
16111613
if !auxres.status.success() {
16121614
return auxres;
@@ -1621,14 +1623,7 @@ impl<'test> TestCx<'test> {
16211623
// actual --out-dir given to the auxiliary or test, as opposed to the root out dir for the entire
16221624
// test
16231625
let out_dir: Cow<'_, Path> = if self.props.unique_doc_out_dir {
1624-
let file_name = self
1625-
.testpaths
1626-
.file
1627-
.file_name()
1628-
.expect("file name should not be empty")
1629-
.to_str()
1630-
.expect("file name utf8")
1631-
.trim_end_matches(".rs");
1626+
let file_name = self.testpaths.file.file_stem().expect("file name should not be empty");
16321627
let out_dir = PathBuf::from_iter([
16331628
root_out_dir,
16341629
Path::new("docs"),

0 commit comments

Comments
 (0)