Fixup to "Disable execveat and AF_ALG tests in seccomp mode"

nix-rust · Sep 19, 2019 · ce331bf · ce331bf
1 parent 67ed663
commit ce331bf
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/test/test.rs b/test/test.rs
@@ -73,33 +73,35 @@ macro_rules! skip_if_not_root {
     };
 }
 
-#[cfg(target_os = "linux")]
-macro_rules! skip_if_seccomp {
-    ($name:expr) => {
-        if let Ok(s) = std::fs::read_to_string("/proc/self/status") {
-            for l in s.lines() {
-                let mut fields = l.split_whitespace();
-                if fields.next() == Some("Seccomp:") &&
-                    fields.next() != Some("0")
-                {
-                    use ::std::io::Write;
-                    let stderr = ::std::io::stderr();
-                    let mut handle = stderr.lock();
-                    writeln!(handle,
-                        "{} cannot be run in Seccomp mode.  Skipping test.",
-                        stringify!($name)).unwrap();
-                    return;
+cfg_if! {
+    if #[cfg(any(target_os = "android", target_os = "linux"))] {
+        macro_rules! skip_if_seccomp {
+            ($name:expr) => {
+                if let Ok(s) = std::fs::read_to_string("/proc/self/status") {
+                    for l in s.lines() {
+                        let mut fields = l.split_whitespace();
+                        if fields.next() == Some("Seccomp:") &&
+                            fields.next() != Some("0")
+                        {
+                            use ::std::io::Write;
+                            let stderr = ::std::io::stderr();
+                            let mut handle = stderr.lock();
+                            writeln!(handle,
+                                "{} cannot be run in Seccomp mode.  Skipping test.",
+                                stringify!($name)).unwrap();
+                            return;
+                        }
+                    }
                 }
             }
         }
+    } else {
+        macro_rules! skip_if_seccomp {
+            ($name:expr) => {}
+        }
     }
 }
 
-#[cfg(not(target_os = "linux"))]
-macro_rules! skip_if_seccomp {
-    ($name:expr) => {}
-}
-
 mod sys;
 mod test_dir;
 mod test_fcntl;