OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move forward to add rustdoc test

This commit is contained in:
Guillaume Gomez 2018-01-08 23:43:20 +01:00
parent 43acd233b3
commit 50bb6ba13e
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/builder.rs
View File

@ -254,7 +254,9 @@ impl<'a> Builder<'a> {
Kind::Test => describe!(check::Tidy, check::Bootstrap, check::DefaultCompiletest,
check::HostCompiletest, check::Crate, check::CrateLibrustc, check::Rustdoc,
check::Linkcheck, check::Cargotest, check::Cargo, check::Rls, check::Docs,
check::ErrorIndex, check::Distcheck, check::Rustfmt, check::Miri, check::Clippy),
check::ErrorIndex, check::Distcheck, check::Rustfmt, check::Miri, check::Clippy,
check::RustdocJS),
Kind::Bench => describe!(check::Crate, check::CrateLibrustc),
Kind::Doc => describe!(doc::UnstableBook, doc::UnstableBookGen, doc::TheBook,
doc::Standalone, doc::Std, doc::Test, doc::Rustc, doc::ErrorIndex, doc::Nomicon,

21
src/bootstrap/check.rs
View File

@ -430,12 +430,12 @@ pub struct RustdocJS {
}
impl Step for RustdocJS {
type Output = PathBuf;
type Output = ();
const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun) -> ShouldRun {
run.path("node")
run.path("src/tests/rustdoc-js")
}
fn make_run(run: RunConfig) {
@ -444,17 +444,11 @@ impl Step for RustdocJS {
});
}
fn run(self, _: &Builder) {
let cmd = if cfg!(target_os = "windows") {
let command = Command::new("cmd");
command.args(&["/C", "node src/tools/rustdoc-js/tester.js"]);
command
} else {
let command = Command::new("sh");
command.args(&["-c", "node src/tools/rustdoc-js/tester.js"]);
command
};
builder.run(cmd);
fn run(self, builder: &Builder) {
let nodejs = builder.config.nodejs.clone();
let mut command = Command::new(&nodejs.expect("no nodejs found"));
command.args(&["src/tools/rustdoc-js/tester.js", &*self.host]);
builder.run(&mut command);
}
}
@ -604,7 +598,6 @@ static HOST_COMPILETESTS: &[Test] = &[
},
Test { path: "src/test/run-make", mode: "run-make", suite: "run-make" },
Test { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" },
Test { path: "src/test/rustdoc-js", mode: "rustdoc-js", suite: "rustdoc-js" },
Test { path: "src/test/pretty", mode: "pretty", suite: "pretty" },
Test { path: "src/test/run-pass/pretty", mode: "pretty", suite: "run-pass" },

2
src/bootstrap/tool.rs
View File

@ -260,7 +260,7 @@ tool!(
BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::Libstd;
RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::Libstd;
RustInstaller, "src/tools/rust-installer", "fabricate", Mode::Libstd;
RustdocJS, "node", "node", Mode::Tool;
RustdocJS, "rustdoc-js", "js-tests", Mode::Tool;
);
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]