mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes after review

Browse Source
This commit is contained in:
Folkert 2024-08-04 22:24:20 +02:00
parent ae68b2fc56
commit 3e5885f7d2
No known key found for this signature in database
GPG Key ID: 1F17F6FFD112B97C
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/run-make/thumb-none-qemu/example/.cargo/config → tests/run-make/thumb-none-qemu/example/.cargo/config.toml
View File

@ -1,6 +1,5 @@
[target.thumbv6m-none-eabi] [target.thumbv6m-none-eabi]
# FIXME: Should be Cortex-M0, but Qemu used by CI is too old runner = "qemu-system-arm -cpu cortex-m0 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
[target.thumbv7m-none-eabi] [target.thumbv7m-none-eabi]
runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel" runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
@ -12,7 +11,7 @@ runner = "qemu-system-arm -cpu cortex-m4 -machine lm3s6965evb -nographic -semiho
runner = "qemu-system-arm -cpu cortex-m4 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel" runner = "qemu-system-arm -cpu cortex-m4 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
[target.thumbv8m.base-none-eabi] [target.thumbv8m.base-none-eabi]
# FIXME: Should be the Cortex-M23, bt Qemu does not currently support it # FIXME: Should be the Cortex-M23, but Qemu does not currently support it
runner = "qemu-system-arm -cpu cortex-m33 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel" runner = "qemu-system-arm -cpu cortex-m33 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
[target.thumbv8m.main-none-eabi] [target.thumbv8m.main-none-eabi]

33
tests/run-make/thumb-none-qemu/rmake.rs
View File

@ -1,31 +1,44 @@
//! This test runs a basic application for thumb targets, using the cortex-m crate.
//!
//! These targets are very bare-metal: the first instruction the core runs on
//! power-on is already user code. The cortex-m-rt has to initialize the stack, .data,
//! .bss, enable the FPU if present, etc.
//!
//! This test builds and runs the applications for various thumb targets using qemu.
//!
//! How to run this //! How to run this
//! $ ./x.py clean //! $ ./x.py clean
//! $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi tests/run-make //! $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi tests/run-make
//! //!
//! For supported targets, see `example/.cargo/config` //! For supported targets, see `example/.cargo/config.toml`
//!
//! FIXME: https://github.com/rust-lang/rust/issues/128733 this test uses external
//! dependencies, and needs an active internet connection
//!
//! FIXME: https://github.com/rust-lang/rust/issues/128734 extract bootstrap cargo
//! to a proper command
//@ only-thumb //@ only-thumb
use std::path::PathBuf; use std::path::PathBuf;
use run_make_support::{cmd, env_var}; use run_make_support::{cmd, env_var, path_helpers, target};
const CRATE: &str = "example"; const CRATE: &str = "example";
fn main() { fn main() {
std::env::set_current_dir(CRATE).unwrap(); std::env::set_current_dir(CRATE).unwrap();
let target = env_var("TARGET");
let bootstrap_cargo = env_var("BOOTSTRAP_CARGO"); let bootstrap_cargo = env_var("BOOTSTRAP_CARGO");
let path = env_var("PATH"); let path = env_var("PATH");
let rustc = env_var("RUSTC"); let rustc = env_var("RUSTC");
let target_dir = PathBuf::from("target"); let target_dir = path_helpers::path("target");
let manifest_path = PathBuf::from("Cargo.toml"); let manifest_path = path_helpers::path("Cargo.toml");
let debug = { let debug = {
let mut cmd = cmd(&bootstrap_cargo); let mut cmd = cmd(&bootstrap_cargo);
cmd.args(&["run", "--target", &target]) cmd.args(&["run", "--target", &target()])
.env("RUSTFLAGS", "-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x") .env("RUSTFLAGS", "-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x")
.env("CARGO_TARGET_DIR", &target_dir) .env("CARGO_TARGET_DIR", &target_dir)
.env("PATH", &path) .env("PATH", &path)
@ -33,12 +46,11 @@ fn main() {
cmd.run() cmd.run()
}; };
let stdout = debug.stdout_utf8(); debug.assert_stdout_contains("x = 42");
assert!(stdout.contains("x = 42"), "stdout: {:?}", stdout);
let release = { let release = {
let mut cmd = cmd(&bootstrap_cargo); let mut cmd = cmd(&bootstrap_cargo);
cmd.args(&["run", "--release", "--target", &target]) cmd.args(&["run", "--release", "--target", &target()])
.env("RUSTFLAGS", "-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x") .env("RUSTFLAGS", "-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x")
.env("CARGO_TARGET_DIR", &target_dir) .env("CARGO_TARGET_DIR", &target_dir)
.env("PATH", &path) .env("PATH", &path)
@ -46,6 +58,5 @@ fn main() {
cmd.run() cmd.run()
}; };
let stdout = release.stdout_utf8(); release.assert_stdout_contains("x = 42");
assert!(stdout.contains("x = 42"), "stdout: {:?}", stdout);
} }