diff options
| author | mark <markm@cs.wisc.edu> | 2020-07-27 23:02:34 -0500 |
|---|---|---|
| committer | mark <markm@cs.wisc.edu> | 2020-07-28 13:03:59 -0500 |
| commit | 856f68fa14806a6395e71a9ab6c5101914aa1ae2 (patch) | |
| tree | 5b75d431885638f40f1de37aba4b179b3883ebad | |
| parent | 7b3a7819371cef92a187e9bac8f7810ccde15216 (diff) | |
| download | rust-856f68fa14806a6395e71a9ab6c5101914aa1ae2.tar.gz rust-856f68fa14806a6395e71a9ab6c5101914aa1ae2.zip | |
reenable tests after moving std
| -rw-r--r-- | src/bootstrap/builder/tests.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 19 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs index 4293844fcbf..111971534ba 100644 --- a/src/bootstrap/builder/tests.rs +++ b/src/bootstrap/builder/tests.rs @@ -546,9 +546,7 @@ mod dist { ); } - //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 addc51faa5e..05af7210b1c 100644 --- 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<'_> { |