diff options
| author | bors <bors@rust-lang.org> | 2017-07-07 06:01:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-07 06:01:30 +0000 |
| commit | 24fc541e7cee966ad8752eb8360f0d4e9ba0bef0 (patch) | |
| tree | 936dca69b40ca42237264837e2394a5da1e755c5 | |
| parent | 54e3fe7af0c448858fb1ac9c2d48da8bc4f6f1f8 (diff) | |
| parent | 1966a6798ddd110c2776a43461cd3a4778e20f93 (diff) | |
| download | rust-24fc541e7cee966ad8752eb8360f0d4e9ba0bef0.tar.gz rust-24fc541e7cee966ad8752eb8360f0d4e9ba0bef0.zip | |
Auto merge of #43068 - ollie27:rustdoc_markdown_tests, r=GuillaumeGomez
rustdoc: Don't run Markdown tests twice This matches the behaviour for finding tests in Rust files. This was a regression from 1.17 to 1.18 so it would be a good idea to backport this to beta so at least 1.19 won't also be affected. Fixes #42726 r? @GuillaumeGomez
| -rw-r--r-- | src/librustdoc/markdown.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs index 057ce69d9de..57e8e88cd13 100644 --- a/src/librustdoc/markdown.rs +++ b/src/librustdoc/markdown.rs @@ -163,8 +163,12 @@ pub fn test(input: &str, cfgs: Vec<String>, libs: SearchPaths, externs: Externs, true, opts, maybe_sysroot, None, Some(input.to_owned()), render_type); - old_find_testable_code(&input_str, &mut collector, DUMMY_SP); - find_testable_code(&input_str, &mut collector, DUMMY_SP); + if render_type == RenderType::Pulldown { + old_find_testable_code(&input_str, &mut collector, DUMMY_SP); + find_testable_code(&input_str, &mut collector, DUMMY_SP); + } else { + old_find_testable_code(&input_str, &mut collector, DUMMY_SP); + } test_args.insert(0, "rustdoctest".to_string()); testing::test_main(&test_args, collector.tests, testing::Options::new().display_output(display_warnings)); |
