T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wire env variables through test runner to TESTCONFIG

Browse Source
This commit is contained in:
Pat Hickey
2021-01-28 11:34:18 -08:00
parent bbbe168ca1
commit e758318fee
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/test-programs/wasi-tests/src/config.rs
View File

@@ -5,15 +5,15 @@ pub struct TestConfig {
}
enum ErrnoMode {
Linux,
Unix,
Windows,
Permissive,
}
impl TestConfig {
pub fn from_env() -> Self {
let errno_mode = if std::env::var("ERRNO_MODE_LINUX").is_ok() {
ErrnoMode::Linux
let errno_mode = if std::env::var("ERRNO_MODE_UNIX").is_ok() {
ErrnoMode::Unix
} else if std::env::var("ERRNO_MODE_WINDOWS").is_ok() {
ErrnoMode::Windows
} else {
@@ -27,9 +27,9 @@ impl TestConfig {
no_fd_allocate,
}
}
pub fn errno_expect_linux(&self) -> bool {
pub fn errno_expect_unix(&self) -> bool {
match self.errno_mode {
ErrnoMode::Linux => true,
ErrnoMode::Unix => true,
_ => false,
}
}

4
crates/test-programs/wasi-tests/src/lib.rs
View File

@@ -80,9 +80,9 @@ macro_rules! assert_errno {
assert_errno!(e, $($rest),+, $i);
}
};
($s:expr, linux => $i:expr, $( $rest:expr ),+) => {
($s:expr, unix => $i:expr, $( $rest:expr ),+) => {
let e = $s;
if $crate::TESTCONFIG.errno_expect_linux() {
if $crate::TESTCONFIG.errno_expect_unix() {
assert_errno!(e, $i);
} else {
assert_errno!(e, $($rest),+, $i);