Skip to content

Commit 9b97d1e

Browse files
committedApr 21, 2018
Auto merge of #50127 - alexcrichton:beta-next2, r=alexcrichton
[beta] Processing merged backports This is a backport of the following PRs: * #49386 * #49465 * #49647 * #49692 * #49695 * #49714 * #49730 * #49830 * #49981
2 parents 8423230 + 84fdaf0 commit 9b97d1e

File tree

41 files changed

+423
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+423
-127
lines changed
 

‎.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ matrix:
176176
if: branch = auto
177177
- env: IMAGE=x86_64-gnu-distcheck
178178
if: branch = auto
179-
- env: IMAGE=x86_64-gnu-incremental
180-
if: branch = auto
181179

182180
- stage: publish toolstate
183181
if: branch = master AND type = push

‎src/bootstrap/doc.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ impl Step for Test {
512512

513513
fn should_run(run: ShouldRun) -> ShouldRun {
514514
let builder = run.builder;
515-
run.krate("test").default_condition(builder.config.compiler_docs)
515+
run.krate("test").default_condition(builder.build.config.docs)
516516
}
517517

518518
fn make_run(run: RunConfig) {
@@ -555,6 +555,9 @@ impl Step for Test {
555555

556556
let mut cargo = builder.cargo(compiler, Mode::Libtest, target, "doc");
557557
compile::test_cargo(build, &compiler, target, &mut cargo);
558+
559+
cargo.arg("--no-deps").arg("-p").arg("test");
560+
558561
build.run(&mut cargo);
559562
cp_r(&my_out, &out);
560563
}

0 commit comments

Comments
 (0)