Ignore integration tests in cross-compiled targets

As stated [here](https://github.com/rust-embedded/cross#supported-targets)
spawning threads in tests will make them fail or they may not terminate
at all.
This commit is contained in:
Danny Moesch 2021-03-19 16:12:55 +01:00
parent ab6827df4e
commit 7724332232
2 changed files with 64 additions and 50 deletions

View file

@ -31,7 +31,7 @@ jobs:
- os: macos-latest
target: aarch64-apple-darwin
use-cross: false
use-cross: true
steps:
- name: Checkout repository
@ -47,6 +47,16 @@ jobs:
override: true
target: ${{ matrix.target }}
- name: Create .cargo/config.toml
if: ${{ matrix.use-cross == true }}
shell: bash
run: |
mkdir .cargo
cat > .cargo/config.toml <<EOF
[target.${{ matrix.target }}]
rustflags = ["--cfg", "sd_cross_compile"]
EOF
- name: Test
uses: actions-rs/cargo@v1
with:

View file

@ -1,66 +1,70 @@
use anyhow::Result;
use assert_cmd::Command;
use std::io::prelude::*;
#[cfg(test)]
#[cfg(not(sd_cross_compile))] // Cross-compilation does not allow to spawn threads but `command.assert()` would do.
mod cli {
use anyhow::Result;
use assert_cmd::Command;
use std::io::prelude::*;
fn sd() -> Command {
Command::cargo_bin(env!("CARGO_PKG_NAME")).expect("Error invoking sd")
}
fn sd() -> Command {
Command::cargo_bin(env!("CARGO_PKG_NAME")).expect("Error invoking sd")
}
fn assert_file(path: &std::path::Path, content: &str) {
assert_eq!(content, std::fs::read_to_string(path).unwrap());
}
fn assert_file(path: &std::path::Path, content: &str) {
assert_eq!(content, std::fs::read_to_string(path).unwrap());
}
#[test]
fn in_place() -> Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
file.write(b"abc123def")?;
let path = file.into_temp_path();
#[test]
fn in_place() -> Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
file.write(b"abc123def")?;
let path = file.into_temp_path();
sd().args(&["abc\\d+", "", path.to_str().unwrap()])
.assert()
.success();
assert_file(&path.to_path_buf(), "def");
sd().args(&["abc\\d+", "", path.to_str().unwrap()])
.assert()
.success();
assert_file(&path.to_path_buf(), "def");
Ok(())
}
Ok(())
}
#[test]
fn in_place_with_empty_result_file() -> Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
file.write(b"a7c")?;
let path = file.into_temp_path();
#[test]
fn in_place_with_empty_result_file() -> Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
file.write(b"a7c")?;
let path = file.into_temp_path();
sd().args(&["a\\dc", "", path.to_str().unwrap()])
.assert()
.success();
assert_file(&path.to_path_buf(), "");
sd().args(&["a\\dc", "", path.to_str().unwrap()])
.assert()
.success();
assert_file(&path.to_path_buf(), "");
Ok(())
}
Ok(())
}
#[test]
fn replace_into_stdout() -> Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
file.write(b"abc123def")?;
#[test]
fn replace_into_stdout() -> Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
file.write(b"abc123def")?;
#[rustfmt::skip]
#[rustfmt::skip]
sd().args(&["-p", "abc\\d+", "", file.path().to_str().unwrap()])
.assert()
.success()
.stdout("def");
assert_file(file.path(), "abc123def");
assert_file(file.path(), "abc123def");
Ok(())
}
#[test]
fn stdin() -> Result<()> {
sd().args(&["abc\\d+", ""])
.write_stdin("abc123def")
.assert()
.success()
.stdout("def");
Ok(())
Ok(())
}
#[test]
fn stdin() -> Result<()> {
sd().args(&["abc\\d+", ""])
.write_stdin("abc123def")
.assert()
.success()
.stdout("def");
Ok(())
}
}