fix tests

This commit is contained in:
Jorge Aparicio
2018-05-12 20:49:12 +02:00
parent 0f139c386b
commit 66c0c588b0
4 changed files with 12 additions and 20 deletions

View File

@@ -6,37 +6,29 @@ matrix:
rust: nightly rust: nightly
addons: addons:
apt: apt:
sources:
- debian-sid
packages: packages:
- binutils-arm-none-eabi - gcc-arm-none-eabi
- env: TARGET=thumbv7m-none-eabi - env: TARGET=thumbv7m-none-eabi
rust: nightly rust: nightly
addons: addons:
apt: apt:
sources:
- debian-sid
packages: packages:
- binutils-arm-none-eabi - gcc-arm-none-eabi
- env: TARGET=thumbv7em-none-eabi - env: TARGET=thumbv7em-none-eabi
rust: nightly rust: nightly
addons: addons:
apt: apt:
sources:
- debian-sid
packages: packages:
- binutils-arm-none-eabi - gcc-arm-none-eabi
- env: TARGET=thumbv7em-none-eabihf - env: TARGET=thumbv7em-none-eabihf
rust: nightly rust: nightly
addons: addons:
apt: apt:
sources:
- debian-sid
packages: packages:
- binutils-arm-none-eabi - gcc-arm-none-eabi
before_install: set -e before_install: set -e

View File

@@ -12,11 +12,13 @@ version = "0.3.0"
cortex-m = "0.5.0" cortex-m = "0.5.0"
cortex-m-rt = "0.5.0" cortex-m-rt = "0.5.0"
cortex-m-semihosting = "0.3.0" cortex-m-semihosting = "0.3.0"
panic-itm = "0.1.1"
panic-semihosting = "0.2.0" panic-semihosting = "0.2.0"
# Uncomment for the panic example.
# panic-itm = "0.1.1"
# Uncomment for the allocator example. # Uncomment for the allocator example.
# alloc-cortex-m = "0.3.6" # alloc-cortex-m = "0.3.4"
# Uncomment for the device example. # Uncomment for the device example.
# [dependencies.stm32f103xx] # [dependencies.stm32f103xx]

View File

@@ -9,7 +9,6 @@ main() {
cat >memory.x <<'EOF' cat >memory.x <<'EOF'
MEMORY MEMORY
{ {
/* NOTE K = KiBi = 1024 bytes */
FLASH : ORIGIN = 0x08000000, LENGTH = 256K FLASH : ORIGIN = 0x08000000, LENGTH = 256K
RAM : ORIGIN = 0x20000000, LENGTH = 40K RAM : ORIGIN = 0x20000000, LENGTH = 40K
} }
@@ -34,17 +33,15 @@ EOF
cargo build --target $TARGET --example $ex --release cargo build --target $TARGET --example $ex --release
examples+=( $ex ) examples+=( $ex )
fi fi
# Allocator example needs an extra dependency # Allocator example needs an extra dependency
cat >>Cargo.toml <<'EOF' cat >>Cargo.toml <<'EOF'
[dependencies.alloc-cortex-m] [dependencies.alloc-cortex-m]
version = "0.3.3" version = "0.3.4"
EOF EOF
local ex=allocator local ex=allocator
cargo build --target $TARGET --example $ex
cargo build --target $TARGET --example $ex --release cargo build --target $TARGET --example $ex --release
examples+=( $ex ) examples+=( $ex )
@@ -54,7 +51,7 @@ EOF
cat >>Cargo.toml <<'EOF' cat >>Cargo.toml <<'EOF'
[dependencies.stm32f103xx] [dependencies.stm32f103xx]
features = ["rt"] features = ["rt"]
version = "0.9.0" version = "0.10.0"
EOF EOF
local ex=device local ex=device

View File

@@ -18,6 +18,7 @@ extern crate cortex_m_rt as rt;
extern crate panic_semihosting; extern crate panic_semihosting;
// Logs panic messages using the ITM (Instrumentation Trace Macrocell) // Logs panic messages using the ITM (Instrumentation Trace Macrocell)
// NOTE to use this you need to uncomment the `panic-itm` dependency in Cargo.toml
// extern crate panic_itm; // extern crate panic_itm;
use rt::ExceptionFrame; use rt::ExceptionFrame;