Skip to content

Commit 66c0c58

Browse files
committed
fix tests
1 parent 0f139c3 commit 66c0c58

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

Diff for: .travis.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,29 @@ matrix:
66
rust: nightly
77
addons:
88
apt:
9-
sources:
10-
- debian-sid
119
packages:
12-
- binutils-arm-none-eabi
10+
- gcc-arm-none-eabi
1311

1412
- env: TARGET=thumbv7m-none-eabi
1513
rust: nightly
1614
addons:
1715
apt:
18-
sources:
19-
- debian-sid
2016
packages:
21-
- binutils-arm-none-eabi
17+
- gcc-arm-none-eabi
2218

2319
- env: TARGET=thumbv7em-none-eabi
2420
rust: nightly
2521
addons:
2622
apt:
27-
sources:
28-
- debian-sid
2923
packages:
30-
- binutils-arm-none-eabi
24+
- gcc-arm-none-eabi
3125

3226
- env: TARGET=thumbv7em-none-eabihf
3327
rust: nightly
3428
addons:
3529
apt:
36-
sources:
37-
- debian-sid
3830
packages:
39-
- binutils-arm-none-eabi
31+
- gcc-arm-none-eabi
4032

4133
before_install: set -e
4234

Diff for: Cargo.toml

+5-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ version = "0.3.0"
1212
cortex-m = "0.5.0"
1313
cortex-m-rt = "0.5.0"
1414
cortex-m-semihosting = "0.3.0"
15-
panic-itm = "0.1.1"
1615
panic-semihosting = "0.2.0"
1716

17+
# Uncomment for the panic example.
18+
# panic-itm = "0.1.1"
19+
1820
# Uncomment for the allocator example.
19-
# alloc-cortex-m = "0.3.6"
21+
# alloc-cortex-m = "0.3.4"
2022

2123
# Uncomment for the device example.
2224
# [dependencies.stm32f103xx]
@@ -26,4 +28,4 @@ panic-semihosting = "0.2.0"
2628
[profile.release]
2729
codegen-units = 1 # better optimizations
2830
debug = true
29-
lto = true
31+
lto = true

Diff for: ci/script.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ main() {
99
cat >memory.x <<'EOF'
1010
MEMORY
1111
{
12-
/* NOTE K = KiBi = 1024 bytes */
1312
FLASH : ORIGIN = 0x08000000, LENGTH = 256K
1413
RAM : ORIGIN = 0x20000000, LENGTH = 40K
1514
}
@@ -34,17 +33,15 @@ EOF
3433
cargo build --target $TARGET --example $ex --release
3534

3635
examples+=( $ex )
37-
3836
fi
3937

4038
# Allocator example needs an extra dependency
4139
cat >>Cargo.toml <<'EOF'
4240
[dependencies.alloc-cortex-m]
43-
version = "0.3.3"
41+
version = "0.3.4"
4442
EOF
4543

4644
local ex=allocator
47-
cargo build --target $TARGET --example $ex
4845
cargo build --target $TARGET --example $ex --release
4946

5047
examples+=( $ex )
@@ -54,7 +51,7 @@ EOF
5451
cat >>Cargo.toml <<'EOF'
5552
[dependencies.stm32f103xx]
5653
features = ["rt"]
57-
version = "0.9.0"
54+
version = "0.10.0"
5855
EOF
5956

6057
local ex=device

Diff for: examples/panic.rs

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ extern crate cortex_m_rt as rt;
1818
extern crate panic_semihosting;
1919

2020
// Logs panic messages using the ITM (Instrumentation Trace Macrocell)
21+
// NOTE to use this you need to uncomment the `panic-itm` dependency in Cargo.toml
2122
// extern crate panic_itm;
2223

2324
use rt::ExceptionFrame;

0 commit comments

Comments
 (0)