From 1966a6798ddd110c2776a43461cd3a4778e20f93 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Wed, 5 Jul 2017 15:47:54 +0100 Subject: [PATCH] rustdoc: Don't run Markdown tests twice This matches the behaviour for finding tests in Rust files. --- src/librustdoc/markdown.rs | 8 ++++++-- 1 file 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, 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)); -- 2.44.0