diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-03-16 01:30:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 01:30:33 +0100 |
| commit | fdb5df049ca21cd7c15eecc9c978708a4f052832 (patch) | |
| tree | b1ee391e0747fd25d56603f08af48c9dfa430738 /src/bootstrap | |
| parent | bbdc871c5377e4c78a565d26f232a11516fe38f9 (diff) | |
| parent | 3f58ab6e24af34265229f701d48eb240cc06d751 (diff) | |
Rollup merge of #69964 - ollie27:ci_nodejs, r=Mark-Simulacrum,GuillaumeGomez
Add Node.js to PR CI image This should allow the `rustdoc-js` and `rustdoc-js-std` test suites to run automatically on PRs.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 1b9e9a88948..66fd2985cb4 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -607,7 +607,6 @@ impl Step for RustdocTheme { #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub struct RustdocJSStd { - pub host: Interned<String>, pub target: Interned<String>, } @@ -621,13 +620,16 @@ impl Step for RustdocJSStd { } fn make_run(run: RunConfig<'_>) { - run.builder.ensure(RustdocJSStd { host: run.host, target: run.target }); + run.builder.ensure(RustdocJSStd { target: run.target }); } fn run(self, builder: &Builder<'_>) { if let Some(ref nodejs) = builder.config.nodejs { let mut command = Command::new(nodejs); - command.args(&["src/tools/rustdoc-js-std/tester.js", &*self.host]); + command + .arg(builder.src.join("src/tools/rustdoc-js-std/tester.js")) + .arg(builder.doc_out(self.target)) + .arg(builder.src.join("src/test/rustdoc-js-std")); builder.ensure(crate::doc::Std { target: self.target, stage: builder.top_stage }); builder.run(&mut command); } else { |
