diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2019-11-21 18:58:14 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-11-21 18:58:14 +0000 |
| commit | 2f11f0b439a610f4716375d0b0c5005f7e63cf40 (patch) | |
| tree | 66f3002d9475caa14738eea891fa02558e37348f | |
| parent | 83aa30930babdbec0acd61bece8f116ce52bf036 (diff) | |
| parent | 0ada35e95d033bdc3e725a62d06ef9843bec5e3c (diff) | |
| download | cortex-m-2f11f0b439a610f4716375d0b0c5005f7e63cf40.tar.gz cortex-m-2f11f0b439a610f4716375d0b0c5005f7e63cf40.tar.zst cortex-m-2f11f0b439a610f4716375d0b0c5005f7e63cf40.zip | |
Merge #216
216: Fix compiletest tests r=therealprof a=jonas-schievink
Closes https://github.com/rust-embedded/cortex-m-rt/issues/215
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
| -rw-r--r-- | cortex-m-rt/Cargo.toml | 2 | ||||
| -rw-r--r-- | cortex-m-rt/ci/script.sh | 4 | ||||
| -rw-r--r-- | cortex-m-rt/tests/compile-fail/interrupt-invalid.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml index 5f80353..7bf2283 100644 --- a/cortex-m-rt/Cargo.toml +++ b/cortex-m-rt/Cargo.toml @@ -30,7 +30,7 @@ features = ["small_rng"] version = "0.7" [target.'cfg(not(target_os = "none"))'.dev-dependencies] -compiletest_rs = "0.3.25" +compiletest_rs = "0.4.0" [[example]] name = "device" diff --git a/cortex-m-rt/ci/script.sh b/cortex-m-rt/ci/script.sh index 3569588..cccf5c9 100644 --- a/cortex-m-rt/ci/script.sh +++ b/cortex-m-rt/ci/script.sh @@ -5,7 +5,7 @@ main() { cargo check --target $TARGET --features device - if [ $TARGET = x86_64-unknown-linux-gnu ] && [ $TRAVIS_RUST_VERSION = nightly ]; then + if [ $TARGET = x86_64-unknown-linux-gnu ] && [ $TRAVIS_RUST_VERSION = stable ]; then ( cd macros && cargo check && cargo test ) cargo test --features device --test compiletest @@ -73,7 +73,7 @@ main() { # linking with GNU LD env RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" cargo run --target $TARGET --example qemu | grep "x = 42" env RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" cargo run --target $TARGET --example qemu --release | grep "x = 42" - + # linking with rustc's LLD cargo run --target $TARGET --example qemu | grep "x = 42" cargo run --target $TARGET --example qemu --release | grep "x = 42" diff --git a/cortex-m-rt/tests/compile-fail/interrupt-invalid.rs b/cortex-m-rt/tests/compile-fail/interrupt-invalid.rs index 9b1482a..4e568eb 100644 --- a/cortex-m-rt/tests/compile-fail/interrupt-invalid.rs +++ b/cortex-m-rt/tests/compile-fail/interrupt-invalid.rs @@ -19,4 +19,4 @@ enum interrupt { // NOTE this looks a bit better when using a device crate: // "no variant named `foo` found for type `stm32f30x::Interrupt` in the current scope" #[interrupt] -fn foo() {} //~ ERROR no variant named `foo` found for type `interrupt` in the current scope +fn foo() {} //~ ERROR no variant or associated item named `foo` found for type `interrupt` in the current scope |