Skip to content

Commit 353cef9

Browse files
Use target exe_suffix for doctests
This will use rust_out.exe for doctests on Windows, rust_out.wasm for doctests in the wasm case, and also handles cross-compiling or user-provided targets.
1 parent c0e9c86 commit 353cef9

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/librustdoc/doctest.rs

+14-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use rustc_span::edition::Edition;
1919
use rustc_span::source_map::SourceMap;
2020
use rustc_span::symbol::sym;
2121
use rustc_span::{BytePos, FileName, Pos, Span, DUMMY_SP};
22-
use rustc_target::spec::TargetTriple;
22+
use rustc_target::spec::{Target, TargetTriple};
2323
use tempfile::Builder as TempFileBuilder;
2424

2525
use std::env;
@@ -293,6 +293,16 @@ struct UnusedExterns {
293293
unused_extern_names: Vec<String>,
294294
}
295295

296+
fn add_exe_suffix(input: String, target: &TargetTriple) -> String {
297+
let exe_suffix = match target {
298+
TargetTriple::TargetTriple(_) => Target::expect_builtin(target).options.exe_suffix,
299+
TargetTriple::TargetJson { contents, .. } => {
300+
Target::from_json(contents.parse().unwrap()).unwrap().0.options.exe_suffix
301+
}
302+
};
303+
input + &exe_suffix
304+
}
305+
296306
fn run_test(
297307
test: &str,
298308
crate_name: &str,
@@ -313,7 +323,9 @@ fn run_test(
313323
let (test, line_offset, supports_color) =
314324
make_test(test, Some(crate_name), lang_string.test_harness, opts, edition, Some(test_id));
315325

316-
let output_file = outdir.path().join("rust_out");
326+
// Make sure we emit well-formed executable names for our target.
327+
let rust_out = add_exe_suffix("rust_out".to_owned(), &target);
328+
let output_file = outdir.path().join(rust_out);
317329

318330
let rustc_binary = rustdoc_options
319331
.test_builder

0 commit comments

Comments
 (0)