about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-04-16 00:39:22 +0200
committerGitHub <noreply@github.com>2020-04-16 00:39:22 +0200
commitf71b55d9b2c4fab6e02254729afca247a1b9a31b (patch)
tree2dd2da3a122d7c40f96321cec541f30e3e753659 /src/bootstrap
parent3c6e1936bc410e69f8e5a4a3a40ae83330a381bc (diff)
parent426055cb299017748fcf8368e40afa4259af7a57 (diff)
Rollup merge of #70774 - GuillaumeGomez:clean-rustdoc-js-tools, r=ollie27
End cleanup on rustdoc-js tools

Fixes #70689.

It removes a lot of code, which is pretty nice. :3

We now only have one entry point and a small set of options.

r? @ollie27
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 0bf507f9ebb..85c5d28bb89 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -627,8 +627,14 @@ impl Step for RustdocJSStd {
         if let Some(ref nodejs) = builder.config.nodejs {
             let mut command = Command::new(nodejs);
             command
-                .arg(builder.src.join("src/tools/rustdoc-js-std/tester.js"))
+                .arg(builder.src.join("src/tools/rustdoc-js/tester.js"))
+                .arg("--crate-name")
+                .arg("std")
+                .arg("--resource-suffix")
+                .arg(crate::channel::CFG_RELEASE_NUM)
+                .arg("--doc-folder")
                 .arg(builder.doc_out(self.target))
+                .arg("--test-folder")
                 .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);