From 66c0c588b0136c73c41f8071f11f2552835febc6 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sat, 12 May 2018 20:49:12 +0200
Subject: [PATCH] fix tests

---
 .travis.yml       | 16 ++++------------
 Cargo.toml        |  8 +++++---
 ci/script.sh      |  7 ++-----
 examples/panic.rs |  1 +
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b939699..ec6158e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
diff --git a/Cargo.toml b/Cargo.toml
index bc60c97..a1f9148 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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]
@@ -26,4 +28,4 @@ panic-semihosting = "0.2.0"
 [profile.release]
 codegen-units = 1 # better optimizations
 debug = true
-lto = true
\ No newline at end of file
+lto = true
diff --git a/ci/script.sh b/ci/script.sh
index ac47fd8..d2195a2 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -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
 }
@@ -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 )
@@ -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
diff --git a/examples/panic.rs b/examples/panic.rs
index 0ce22af..0822156 100644
--- a/examples/panic.rs
+++ b/examples/panic.rs
@@ -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;