CI: replace compiletest-rs with trybuild

We use compiletest to run compile-fail tests but compiletest depends on compiler
internals so it breaks every now and then and requires nightly. With trybuild we
can also run compile-fail tests but it works on stable and it already has
reached version 1.0
This commit is contained in:
Jorge Aparicio 2019-11-06 19:05:37 -05:00
parent 72e84cb297
commit 31b392fe3a
12 changed files with 23 additions and 47 deletions

View file

@ -8,6 +8,3 @@ runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semiho
rustflags = [ rustflags = [
"-C", "link-arg=-Tlink.x", "-C", "link-arg=-Tlink.x",
] ]
[build]
target = "thumbv7m-none-eabi"

View file

@ -18,8 +18,7 @@ matrix:
# compile-fail tests # compile-fail tests
- env: TARGET=x86_64-unknown-linux-gnu - env: TARGET=x86_64-unknown-linux-gnu
# FIXME revert this -- compiletest-rs v0.3.25 is broken with recent nightly rust: nightly
rust: nightly-2019-10-31
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
# heterogeneous multi-core support # heterogeneous multi-core support

View file

@ -67,7 +67,7 @@ features = ["exit"]
version = "0.5.2" version = "0.5.2"
[target.x86_64-unknown-linux-gnu.dev-dependencies] [target.x86_64-unknown-linux-gnu.dev-dependencies]
compiletest_rs = "0.3.22" trybuild = "1"
[features] [features]
heterogeneous = ["cortex-m-rtfm-macros/heterogeneous", "microamp"] heterogeneous = ["cortex-m-rtfm-macros/heterogeneous", "microamp"]

View file

@ -37,10 +37,10 @@ main() {
mkdir -p ci/builds mkdir -p ci/builds
if [ $T = x86_64-unknown-linux-gnu ]; then if [ $T = x86_64-unknown-linux-gnu ]; then
if [ $TRAVIS_RUST_VERSION = nightly ]; then # compile-fail tests
# compile-fail tests cargo test --test single --target $T
cargo test --test single --target $T
if [ $TRAVIS_RUST_VERSION = nightly ]; then
# multi-core compile-pass tests # multi-core compile-pass tests
pushd heterogeneous pushd heterogeneous
local exs=( local exs=(

View file

@ -1,19 +1,7 @@
use std::path::PathBuf; use trybuild::TestCases;
use compiletest_rs::{common::Mode, Config};
#[test] #[test]
fn ui() { fn ui() {
let mut config = Config::default(); let t = TestCases::new();
t.compile_fail("ui/single/*.rs");
config.mode = Mode::Ui;
config.src_base = PathBuf::from("ui/single");
config.target_rustcflags = Some(
"--edition=2018 -L target/debug/deps -Z unstable-options --extern rtfm --extern lm3s6965"
.to_owned(),
);
config.link_deps();
config.clean_rmeta();
compiletest_rs::run_tests(&config);
} }

View file

@ -3,6 +3,3 @@ error: only exceptions with configurable priority can be used as hardware tasks
| |
6 | fn nmi(_: nmi::Context) {} 6 | fn nmi(_: nmi::Context) {}
| ^^^ | ^^^
error: aborting due to previous error

View file

@ -3,6 +3,3 @@ error: this exception can't be used because it's being used by the runtime
| |
6 | fn sys_tick(_: sys_tick::Context) {} 6 | fn sys_tick(_: sys_tick::Context) {}
| ^^^^^^^^ | ^^^^^^^^
error: aborting due to previous error

View file

@ -3,6 +3,3 @@ error: not enough `extern` interrupts to dispatch all software tasks (need: 1; g
| |
6 | fn a(_: a::Context) {} 6 | fn a(_: a::Context) {}
| ^ | ^
error: aborting due to previous error

View file

@ -3,6 +3,3 @@ error: `extern` interrupts can't be used as hardware tasks
| |
5 | #[task(binds = UART0)] 5 | #[task(binds = UART0)]
| ^^^^^ | ^^^^^
error: aborting due to previous error

View file

@ -28,6 +28,10 @@ error[E0425]: cannot find value `FOO` in this scope
44 | FOO; 44 | FOO;
| ^^^ not found in this scope | ^^^ not found in this scope
error: aborting due to 5 previous errors error: duplicate lang item in crate `panic_halt`: `panic_impl`.
|
= note: first defined in crate `std`.
For more information about this error, try `rustc --explain E0425`. error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
|
= note: first defined in crate `panic_halt`.

View file

@ -117,7 +117,3 @@ error[E0609]: no field `o5` on type `uart1Resources<'_>`
| ^^ unknown field | ^^ unknown field
| |
= note: available fields are: `__marker__` = note: available fields are: `__marker__`
error: aborting due to 15 previous errors
For more information about this error, try `rustc --explain E0609`.

View file

@ -1,9 +1,13 @@
warning: unused import: `rtfm::app`
--> $DIR/task-priority-too-high.rs:3:5
|
3 | use rtfm::app;
| ^^^^^^^^^
|
= note: `#[warn(unused_imports)]` on by default
error[E0080]: evaluation of constant value failed error[E0080]: evaluation of constant value failed
--> $DIR/task-priority-too-high.rs:5:1 --> $DIR/task-priority-too-high.rs:5:1
| |
5 | #[rtfm::app(device = lm3s6965)] 5 | #[rtfm::app(device = lm3s6965)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
error: aborting due to previous error
For more information about this error, try `rustc --explain E0080`.