Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
japaric committed May 12, 2018
1 parent 0f139c3 commit 66c0c58
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 20 deletions.
16 changes: 4 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,29 @@ matrix:
rust: nightly
addons:
apt:
sources:
- debian-sid
packages:
- binutils-arm-none-eabi
- gcc-arm-none-eabi

- env: TARGET=thumbv7m-none-eabi
rust: nightly
addons:
apt:
sources:
- debian-sid
packages:
- binutils-arm-none-eabi
- gcc-arm-none-eabi

- env: TARGET=thumbv7em-none-eabi
rust: nightly
addons:
apt:
sources:
- debian-sid
packages:
- binutils-arm-none-eabi
- gcc-arm-none-eabi

- env: TARGET=thumbv7em-none-eabihf
rust: nightly
addons:
apt:
sources:
- debian-sid
packages:
- binutils-arm-none-eabi
- gcc-arm-none-eabi

before_install: set -e

Expand Down
8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ version = "0.3.0"
cortex-m = "0.5.0"
cortex-m-rt = "0.5.0"
cortex-m-semihosting = "0.3.0"
panic-itm = "0.1.1"
panic-semihosting = "0.2.0"

# Uncomment for the panic example.
# panic-itm = "0.1.1"

# Uncomment for the allocator example.
# alloc-cortex-m = "0.3.6"
# alloc-cortex-m = "0.3.4"

# Uncomment for the device example.
# [dependencies.stm32f103xx]
Expand All @@ -26,4 +28,4 @@ panic-semihosting = "0.2.0"
[profile.release]
codegen-units = 1 # better optimizations
debug = true
lto = true
lto = true
7 changes: 2 additions & 5 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ main() {
cat >memory.x <<'EOF'
MEMORY
{
/* NOTE K = KiBi = 1024 bytes */
FLASH : ORIGIN = 0x08000000, LENGTH = 256K
RAM : ORIGIN = 0x20000000, LENGTH = 40K
}
Expand All @@ -34,17 +33,15 @@ EOF
cargo build --target $TARGET --example $ex --release

examples+=( $ex )

fi

# Allocator example needs an extra dependency
cat >>Cargo.toml <<'EOF'
[dependencies.alloc-cortex-m]
version = "0.3.3"
version = "0.3.4"
EOF

local ex=allocator
cargo build --target $TARGET --example $ex
cargo build --target $TARGET --example $ex --release

examples+=( $ex )
Expand All @@ -54,7 +51,7 @@ EOF
cat >>Cargo.toml <<'EOF'
[dependencies.stm32f103xx]
features = ["rt"]
version = "0.9.0"
version = "0.10.0"
EOF

local ex=device
Expand Down
1 change: 1 addition & 0 deletions examples/panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ extern crate cortex_m_rt as rt;
extern crate panic_semihosting;

// 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;

use rt::ExceptionFrame;
Expand Down

0 comments on commit 66c0c58

Please sign in to comment.