From 90ffa4ed10cb7efa1cecae7dfd86a27f79384cb2 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Jun 2017 22:09:28 -0500
Subject: [PATCH 1/6] extend test suite
we now at least test one device per vendor in the SVD database
cc #45
---
Cargo.lock | 8 ++++----
ci/script.sh | 23 +++++++++++++++++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index d9ae6854..d6b2a25c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,7 @@ dependencies = [
"clap 2.20.5 (registry+https://github.com/rust-lang/crates.io-index)",
"either 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "inflections 1.0.0 (git+https://github.com/whitequark/inflections)",
+ "inflections 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"svd-parser 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.11.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -99,8 +99,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "inflections"
-version = "1.0.0"
-source = "git+https://github.com/whitequark/inflections#9e524b59017a9e764abde074a1efa2b74f65fac0"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "kernel32-sys"
@@ -225,7 +225,7 @@ dependencies = [
"checksum either 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "63f94a35a9ca0d4178e85f0250373f2cea55c5d603e6993778d68a99b3d8071c"
"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
"checksum gcc 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "c07c758b972368e703a562686adb39125707cc1ef3399da8c019fc6c2498a75d"
-"checksum inflections 1.0.0 (git+https://github.com/whitequark/inflections)" = "<none>"
+"checksum inflections 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f84b1c7604b27e2a7cf95347f1820b46d10a7d48b7b7c22b3824151c76a68d"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135"
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
diff --git a/ci/script.sh b/ci/script.sh
index a1f5678a..11caaf6d 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -30,11 +30,34 @@ main() {
echo 'cortex-m = "0.2.0"' >> $td/Cargo.toml
echo 'vcell = "0.1.0"' >> $td/Cargo.toml
+ test_svd Atmel AT91SAM9CN11
+
+ test_svd Freescale MK81F25615
+
+ test_svd Fujitsu MB9AF10xN
+
+ test_svd Holtek ht32f125x
+
test_svd Nordic nrf51
+
+ # FIXME
+ # test_svd NXP LPC43xx_svd_v5.svd
+
+ test_svd Nuvoton M051_Series
+
+ test_svd SiliconLabs SIM3C1x4_SVD
+
+ test_svd Spansion MB9AF10xN
+
test_svd STMicro STM32F100xx
test_svd STMicro STM32F103xx
test_svd STMicro STM32F30x
+ # FIXME
+ # test_svd TexasInstrument TM4C1230C3PM
+
+ test_svd Toshiba M061
+
rm -rf $td
}
From 1ca07698a434b057c7dbe55fdb4ada06331bae34 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Jun 2017 22:27:59 -0500
Subject: [PATCH 2/6] skip Atmel for now
---
ci/script.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ci/script.sh b/ci/script.sh
index 11caaf6d..f10a7208 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -30,7 +30,8 @@ main() {
echo 'cortex-m = "0.2.0"' >> $td/Cargo.toml
echo 'vcell = "0.1.0"' >> $td/Cargo.toml
- test_svd Atmel AT91SAM9CN11
+ # FIXME
+ # test_svd Atmel AT91SAM9CN11
test_svd Freescale MK81F25615
From 76b566d9ba781c280666ad277fab013aca72d757 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Jun 2017 22:39:50 -0500
Subject: [PATCH 3/6] cargo build -> cargo check
---
ci/script.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/script.sh b/ci/script.sh
index f10a7208..5f18bf72 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -5,7 +5,7 @@ test_svd() {
https://raw.githubusercontent.com/posborne/cmsis-svd/python-0.4/data/$1/${2}.svd \
> $td/${2}.svd
target/$TARGET/release/svd2rust -i $td/${2}.svd > $td/src/lib.rs
- cargo build --manifest-path $td/Cargo.toml
+ cargo check --manifest-path $td/Cargo.toml
}
main() {
From 058330d57248c33f4f528cd31627d90873c34b91 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Jun 2017 22:42:11 -0500
Subject: [PATCH 4/6] skip SiliconLabs
---
ci/script.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ci/script.sh b/ci/script.sh
index 5f18bf72..e4523636 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -46,7 +46,8 @@ main() {
test_svd Nuvoton M051_Series
- test_svd SiliconLabs SIM3C1x4_SVD
+ # FIXME
+ # test_svd SiliconLabs SIM3C1x4_SVD
test_svd Spansion MB9AF10xN
From f82b05db0eb7a298cb1651bc9432562534a3a565 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Jun 2017 22:46:10 -0500
Subject: [PATCH 5/6] put nigthly test first
---
.travis.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a4abb752..4bb1de55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ env:
matrix:
include:
+ # Nightly, for testing
+ - env: TARGET=x86_64-unknown-linux-gnu
+ rust: nightly
+
# Linux
- env: TARGET=i686-unknown-linux-gnu DISABLE_TESTS=1
- env: TARGET=i686-unknown-linux-musl DISABLE_TESTS=1
@@ -22,10 +26,6 @@ matrix:
- env: TARGET=x86_64-apple-darwin DISABLE_TESTS=1
os: osx
- # Nightly, for testing
- - env: TARGET=x86_64-unknown-linux-gnu
- rust: nightly
-
install:
- sh ci/install.sh
- source ~/.cargo/env || true
From 9d190f05765adb4aa7e4f51c63a084c22501cdef Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Jun 2017 23:20:08 -0500
Subject: [PATCH 6/6] skip Spansion
cc #102
---
ci/script.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ci/script.sh b/ci/script.sh
index e4523636..2fdac248 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -49,7 +49,8 @@ main() {
# FIXME
# test_svd SiliconLabs SIM3C1x4_SVD
- test_svd Spansion MB9AF10xN
+ # FIXME #102
+ # test_svd Spansion MB9AF10xN
test_svd STMicro STM32F100xx
test_svd STMicro STM32F103xx