diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2020-12-01 10:50:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 10:50:19 +0000 |
| commit | f45e6953d76d886bb649ffd80f1e19ce2e1bfeda (patch) | |
| tree | 99cbae861d7383107f2a02e8423e2d2cfc78b56d /src/bootstrap | |
| parent | 99e075ff293f56376a3ad27d7fcb038d0e2b5595 (diff) | |
| parent | 872acb0c3589450a10f6fec97cd1a781e2d17794 (diff) | |
| download | rust-f45e6953d76d886bb649ffd80f1e19ce2e1bfeda.tar.gz rust-f45e6953d76d886bb649ffd80f1e19ce2e1bfeda.zip | |
Rollup merge of #79527 - jyn514:intra-doc-tests, r=Manishearth
Move intra-doc link tests into a subdirectory They were starting to get unwieldy. r? ``@Manishearth``
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/test.rs | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 611fecca054..1df50322a07 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -688,38 +688,6 @@ impl Step for RustdocJSNotStd { } } -#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] -pub struct RustdocUi { - pub target: TargetSelection, - pub compiler: Compiler, -} - -impl Step for RustdocUi { - type Output = (); - const DEFAULT: bool = true; - const ONLY_HOSTS: bool = true; - - fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.path("src/test/rustdoc-ui") - } - - fn make_run(run: RunConfig<'_>) { - let compiler = run.builder.compiler(run.builder.top_stage, run.build_triple()); - run.builder.ensure(RustdocUi { target: run.target, compiler }); - } - - fn run(self, builder: &Builder<'_>) { - builder.ensure(Compiletest { - compiler: self.compiler, - target: self.target, - mode: "ui", - suite: "rustdoc-ui", - path: "src/test/rustdoc-ui", - compare_mode: None, - }) - } -} - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Tidy; @@ -934,6 +902,7 @@ default_test!(Debuginfo { path: "src/test/debuginfo", mode: "debuginfo", suite: host_test!(UiFullDeps { path: "src/test/ui-fulldeps", mode: "ui", suite: "ui-fulldeps" }); host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" }); +host_test!(RustdocUi { path: "src/test/rustdoc-ui", mode: "ui", suite: "rustdoc-ui" }); host_test!(Pretty { path: "src/test/pretty", mode: "pretty", suite: "pretty" }); |
