reenable tests after moving std

diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index 4293844fcbf9466245055c7336d13ca876639667..111971534ba5e903026bb9b1b60a973727cfde43 100644 (file)
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -546,9 +546,7 @@ fn doc_ci() {
         );
     }
 
-    //FIXME(mark-i-m): reinstate this test when things are fixed...
-    //#[test]
-    #[allow(dead_code)]
+    #[test]
     fn test_docs() {
         // Behavior of `x.py test` doing various documentation tests.
         let mut config = configure(&[], &[]);

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index addc51faa5e29fa2b8a511d314eaed19ad9855a4..05af7210b1c68569bd732d72c14dd571715eb9c7 100644 (file)
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -106,19 +106,18 @@ impl Step for Linkcheck {
     ///
     /// This tool in `src/tools` will verify the validity of all our links in the
     /// documentation to ensure we don't have a bunch of dead ones.
-    fn run(self, _builder: &Builder<'_>) {
-        // FIXME(mark-i-m): uncomment this after we fix the links...
-        // let host = self.host;
+    fn run(self, builder: &Builder<'_>) {
+        let host = self.host;
 
-        // builder.info(&format!("Linkcheck ({})", host));
+        builder.info(&format!("Linkcheck ({})", host));
 
-        // builder.default_doc(None);
+        builder.default_doc(None);
 
-        // let _time = util::timeit(&builder);
-        // try_run(
-        //     builder,
-        //     builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
-        // );
+        let _time = util::timeit(&builder);
+        try_run(
+            builder,
+            builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
+        );
     }
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {