File tree 1 file changed +3
-8
lines changed
src/tools/compiletest/src
1 file changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -1607,6 +1607,8 @@ impl<'test> TestCx<'test> {
1607
1607
} ;
1608
1608
// Create the directory for the stdout/stderr files.
1609
1609
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.
1610
1612
let auxres = aux_cx. document ( & root_out_dir, root_testpaths) ;
1611
1613
if !auxres. status . success ( ) {
1612
1614
return auxres;
@@ -1621,14 +1623,7 @@ impl<'test> TestCx<'test> {
1621
1623
// actual --out-dir given to the auxiliary or test, as opposed to the root out dir for the entire
1622
1624
// test
1623
1625
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" ) ;
1632
1627
let out_dir = PathBuf :: from_iter ( [
1633
1628
root_out_dir,
1634
1629
Path :: new ( "docs" ) ,
You can’t perform that action at this time.
0 commit comments