From e94c139a47055d3492d6ccccfce4acbcba9d7391 Mon Sep 17 00:00:00 2001 From: Xavier L'Heureux Date: Tue, 16 Jul 2019 15:02:54 -0400 Subject: Remove more unsupported functions and make it possible to run tests --- test/test.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/test.rs') diff --git a/test/test.rs b/test/test.rs index 0efe9bd6..d48874fc 100644 --- a/test/test.rs +++ b/test/test.rs @@ -134,6 +134,7 @@ cfg_if! { } mod sys; +#[cfg(not(target_os = "redox"))] mod test_dir; mod test_fcntl; #[cfg(any(target_os = "android", @@ -145,9 +146,12 @@ mod test_kmod; target_os = "linux", target_os = "netbsd"))] mod test_mq; +#[cfg(not(target_os = "redox"))] mod test_net; mod test_nix_path; +#[cfg(not(target_os = "redox"))] mod test_poll; +#[cfg(not(target_os = "redox"))] mod test_pty; #[cfg(any(target_os = "android", target_os = "linux"))] -- cgit v1.2.3 From 92e63f61cd5046547c30a812cda98d8a2c3b3361 Mon Sep 17 00:00:00 2001 From: Xavier L'Heureux Date: Tue, 17 Sep 2019 13:39:34 -0400 Subject: Remove warnings when compiling for Redox --- test/test.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/test.rs') diff --git a/test/test.rs b/test/test.rs index d48874fc..0bc8341d 100644 --- a/test/test.rs +++ b/test/test.rs @@ -3,7 +3,7 @@ extern crate bytes; extern crate caps; #[macro_use] extern crate cfg_if; -#[macro_use] +#[cfg_attr(not(target_os = "redox"), macro_use)] extern crate nix; #[macro_use] extern crate lazy_static; @@ -58,6 +58,7 @@ macro_rules! skip_if_jailed { } } +#[cfg(not(target_os = "redox"))] macro_rules! skip_if_not_root { ($name:expr) => { use nix::unistd::Uid; -- cgit v1.2.3 From 5229c443fe95d8dd13da6430bf942f9e57377a9d Mon Sep 17 00:00:00 2001 From: Xavier L'Heureux Date: Tue, 17 Sep 2019 17:10:15 -0400 Subject: Add wait, fdatasync, poll and pause for Redox --- test/test.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'test/test.rs') diff --git a/test/test.rs b/test/test.rs index 0bc8341d..29cc8aa3 100644 --- a/test/test.rs +++ b/test/test.rs @@ -150,7 +150,6 @@ mod test_mq; #[cfg(not(target_os = "redox"))] mod test_net; mod test_nix_path; -#[cfg(not(target_os = "redox"))] mod test_poll; #[cfg(not(target_os = "redox"))] mod test_pty; -- cgit v1.2.3 From 106927af9eda1c7b683dfc5b0610e5937494b0dd Mon Sep 17 00:00:00 2001 From: Xavier L'Heureux Date: Tue, 17 Dec 2019 18:18:22 -0500 Subject: Fix test and remove group & user for redox - Make sure all tests pass the CI - Redox does not (yet) have passwd functions, so remove it --- test/test.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test.rs') diff --git a/test/test.rs b/test/test.rs index 29cc8aa3..5319c1d8 100644 --- a/test/test.rs +++ b/test/test.rs @@ -33,7 +33,7 @@ cfg_if! { } } } - } else { + } else if #[cfg(not(target_os = "redox"))] { macro_rules! require_capability { ($capname:ident) => {} } @@ -95,7 +95,7 @@ cfg_if! { } } } - } else { + } else if #[cfg(not(target_os = "redox"))] { macro_rules! skip_if_seccomp { ($name:expr) => {} } -- cgit v1.2.3