Skip to content

Commit 856f68f

Browse files
committed
reenable tests after moving std
1 parent 7b3a781 commit 856f68f

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

src/bootstrap/builder/tests.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,7 @@ mod dist {
546546
);
547547
}
548548

549-
//FIXME(mark-i-m): reinstate this test when things are fixed...
550-
//#[test]
551-
#[allow(dead_code)]
549+
#[test]
552550
fn test_docs() {
553551
// Behavior of `x.py test` doing various documentation tests.
554552
let mut config = configure(&[], &[]);

src/bootstrap/test.rs

+9-10
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,18 @@ impl Step for Linkcheck {
106106
///
107107
/// This tool in `src/tools` will verify the validity of all our links in the
108108
/// documentation to ensure we don't have a bunch of dead ones.
109-
fn run(self, _builder: &Builder<'_>) {
110-
// FIXME(mark-i-m): uncomment this after we fix the links...
111-
// let host = self.host;
109+
fn run(self, builder: &Builder<'_>) {
110+
let host = self.host;
112111

113-
// builder.info(&format!("Linkcheck ({})", host));
112+
builder.info(&format!("Linkcheck ({})", host));
114113

115-
// builder.default_doc(None);
114+
builder.default_doc(None);
116115

117-
// let _time = util::timeit(&builder);
118-
// try_run(
119-
// builder,
120-
// builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
121-
// );
116+
let _time = util::timeit(&builder);
117+
try_run(
118+
builder,
119+
builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
120+
);
122121
}
123122

124123
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {

0 commit comments

Comments
 (0)