diff options
| author |  homunkulus <homunkulus@gmx.com>
| 2017-11-22 08:56:45 +0000 |
|---|---|---|
| committer | homunkulus <homunkulus@gmx.com>
| 2017-11-22 08:56:45 +0000 |
| commit | 99df0776c68fdb377ef7daa34f7fd8481fea590f (patch) | |
| tree | c117a39e2d99a0ffb67427fef72f3735c85e9244 | |
| parent | 948e1fd0fbd96f574c31909843b2ed3debabf6fc (diff) | |
| parent | cdb2118cd36f8bfbdb7e296580cae05d6291bc5d (diff) | |
| download | rtic-99df0776c68fdb377ef7daa34f7fd8481fea590f.tar.gz rtic-99df0776c68fdb377ef7daa34f7fd8481fea590f.tar.zst rtic-99df0776c68fdb377ef7daa34f7fd8481fea590f.zip | |
Auto merge of #51 - japaric:ci, r=japaric
fix ci
None
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | ci/script.sh | 4 | ||||
| -rw-r--r-- | tests/cfail/interrupt.rs | 1 | ||||
| -rw-r--r-- | tests/cfail/wrong-threshold.rs | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 094e996c..d9204559 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ language: rust matrix: include: - env: TARGET=x86_64-unknown-linux-gnu - rust: nightly + # work around problem about 'every suggestion should have at least one span' + rust: nightly-2017-11-21 - env: TARGET=thumbv6m-none-eabi rust: nightly diff --git a/ci/script.sh b/ci/script.sh index 6b855024..af425da5 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -3,12 +3,12 @@ set -euxo pipefail main() { if [ $TARGET = x86_64-unknown-linux-gnu ]; then cargo build - cargo test --tests + cargo test --test cfail return fi xargo build --target $TARGET - xargo test --target $TARGET --examples + xargo check --target $TARGET --examples } main diff --git a/tests/cfail/interrupt.rs b/tests/cfail/interrupt.rs index f7879f49..66d2098b 100644 --- a/tests/cfail/interrupt.rs +++ b/tests/cfail/interrupt.rs @@ -9,7 +9,6 @@ use rtfm::app; app! { //~^ error no associated item named `EXTI33` found for type - //~| error no associated item named `EXTI33` found for type device: stm32f103xx, tasks: { diff --git a/tests/cfail/wrong-threshold.rs b/tests/cfail/wrong-threshold.rs index b46f82de..b9740715 100644 --- a/tests/cfail/wrong-threshold.rs +++ b/tests/cfail/wrong-threshold.rs @@ -39,7 +39,6 @@ fn idle() -> ! { fn exti0(mut ot: &mut Threshold, r: EXTI0::Resources) { r.A.claim(&mut ot, |_a, mut _it| { //~^ error cannot borrow `ot` as mutable more than once at a time - //~| error cannot borrow `ot` as mutable more than once at a time // ERROR must use inner token `it` instead of the outer one (`ot`) r.B.claim(&mut ot, |_b, _| {}) }); |