about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2017-07-05 15:47:54 +0100
committerOliver Middleton <olliemail27@gmail.com>2017-07-06 16:47:58 +0100
commit1966a6798ddd110c2776a43461cd3a4778e20f93 (patch)
treeacbb16d964a582465bb3a636360854b3ca237852
parentccf401f8f7847413ac43f38e3c86016becf67b07 (diff)
rustdoc: Don't run Markdown tests twice
This matches the behaviour for finding tests in Rust files.
-rw-r--r--src/librustdoc/markdown.rs8
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));