aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-04-21 20:02:28 +0000
committerGitHub <noreply@github.com>2020-04-21 20:02:28 +0000
commitbb59606b7cf14105492c034c9875edc4c1725da0 (patch)
treee3e05c8d0a08860a75f7bdb15b0be8543fc8ec83
parente870a68893fd0e7a7f544858846fa5e9eac94b4a (diff)
parent0bd40dad7dc699b80747faedc938210de50a45d5 (diff)
Merge #307
307: Use build.rs for conditional compilation r=korken89 a=AfoHT Extend the current test suite to allow for running tests on newer rustc-versions than current MSRV. Required by #306 to add special tests for future MSRV. To exclude an example from the regular non-nightly testing: ``` #![no_main] #![no_std] #[cfg(rustc_is_nightly)] mod example { use panic_halt as _; #[rtfm::app(device = lm3s6965)] const APP: () = { <more code> } } ``` Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
-rw-r--r--Cargo.toml3
-rw-r--r--build.rs5
-rw-r--r--ci/script.sh7
3 files changed, 15 insertions, 0 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 01b3ede..603129a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,6 +53,9 @@ rtfm-core = "0.3.0"
cortex-m-rt = "0.6.9"
heapless = "0.5.0"
+[build-dependencies]
+version_check = "0.9"
+
[dependencies.microamp]
optional = true
version = "0.1.0-alpha.2"
diff --git a/build.rs b/build.rs
index 14c3d24..fee1a6a 100644
--- a/build.rs
+++ b/build.rs
@@ -1,8 +1,13 @@
use std::env;
+use version_check;
fn main() {
let target = env::var("TARGET").unwrap();
+ if version_check::Channel::read().unwrap().is_nightly() {
+ println!("cargo:rustc-cfg=rustc_is_nightly")
+ }
+
if target.starts_with("thumbv6m") {
println!("cargo:rustc-cfg=armv6m")
}
diff --git a/ci/script.sh b/ci/script.sh
index 78341e1..7b86e52 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -44,6 +44,13 @@ main() {
fi
if [ $TRAVIS_RUST_VERSION = nightly ]; then
+ # Tests where required MSRV > 1.36
+ #local exs=(
+ #)
+ #for ex in ${exs[@]}; do
+ # cargo check --example $ex --target $T
+ #done
+
# multi-core compile-pass tests
pushd heterogeneous
local exs=(