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 @@ -1610,6 +1610,8 @@ impl<'test> TestCx<'test> {
1610
1610
} ;
1611
1611
// Create the directory for the stdout/stderr files.
1612
1612
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.
1613
1615
let auxres = aux_cx. document ( & root_out_dir, root_testpaths) ;
1614
1616
if !auxres. status . success ( ) {
1615
1617
return auxres;
@@ -1624,14 +1626,7 @@ impl<'test> TestCx<'test> {
1624
1626
// actual --out-dir given to the auxiliary or test, as opposed to the root out dir for the entire
1625
1627
// test
1626
1628
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" ) ;
1635
1630
let out_dir = PathBuf :: from_iter ( [
1636
1631
root_out_dir,
1637
1632
Path :: new ( "docs" ) ,
You can’t perform that action at this time.
0 commit comments