From: bors <bors@rust-lang.org>
Date: Thu, 3 May 2018 13:43:38 +0000 (+0000)
Subject: Auto merge of #5464 - ehuss:restore-example-test, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4dc5db2db5603b926467996ccdfc8262506a2010;p=cargo.git

Auto merge of #5464 - ehuss:restore-example-test, r=alexcrichton

Partially revert change to testing examples.

Fixes #5437

I don't think changing the behavior was quite the correct thing to do.  This new behavior is very similar to the old with a few small differences:

```
cargo test
    ORGINAL: Only builds examples.
    NEW: Builds all examples.  Any example with `test` set is tested.

cargo test --tests
    ORIGINAL: Runs all examples as tests.
    NEW: Only runs examples as tests if `test` is set.

cargo test --examples
    ORIGINAL: Runs all examples as tests.
    NEW: (SAME)

cargo test --example foo
    ORIGINAL: Runs the given example as a test.
    NEW: (SAME)

cargo test --all-targets
    ORIGINAL: Runs all examples as tests.
    NEW: (SAME)
```
---

4dc5db2db5603b926467996ccdfc8262506a2010