Fix a few test failures on FreeBSD.

Author: sunfishcode

cap-primitives/src/posish/fs/mod.rs

@@ -119,7 +119,14 @@ fn tty_path() {
     #[cfg(unix)]
     use std::os::unix::fs::FileTypeExt;
 
-    for path in &["/dev/tty", "/dev/stdin", "/dev/stdout", "/dev/stderr"] {
+    // On FreeBSD, `ttyname` doesn't seem to work on /dev/std{in,out,err}.
+    let paths: &[&str] = if cfg!(target_os = "freebsd") {
+        &["/dev/tty"]
+    } else {
+        &["/dev/tty", "/dev/stdin", "/dev/stdout", "/dev/stderr"]
+    };
+
+    for path in paths {
         // Not all host configurations have these, so only test them if we can
         // open and canonicalize them, and if they're not FIFOs, which some
         // OS's use for stdin/stdout/stderr.

tests/fs_additional.rs

@@ -584,23 +584,60 @@ fn dir_unsearchable_unreadable() {
     options.mode(0o000);
     check!(tmpdir.create_dir_with("dir", &options));
 
-    // Platforms with `O_PATH` can open a directory with no permissions.
+    // Platforms with `O_PATH` can open a directory with no permissions. And
+    // somehow FreeBSD can too; see `dir_unsearchable_unreadable_ambient`
+    // below confirming this.
     if cfg!(any(
-        target_os = "linux",
         target_os = "android",
-        target_os = "redox"
+        target_os = "linux",
+        target_os = "redox",
     )) {
-        check!(tmpdir.open_dir("dir"));
+        let dir = check!(tmpdir.open_dir("dir"));
+        assert!(dir.entries().is_err());
+        assert!(dir.open_dir(".").is_err());
+    } else if cfg!(target_os = "freebsd") {
+        let dir = check!(tmpdir.open_dir("dir"));
+        check!(dir.metadata("."));
+        check!(dir.entries());
+        check!(dir.open_dir("."));
     } else {
         assert!(tmpdir.open_dir("dir").is_err());
     }
 }
 
+/// Like `dir_unsearchable_unreadable`, but uses ambient-authority APIs
+/// to test underlying host functionality.
+#[cfg(unix)]
+#[test]
+fn dir_unsearchable_unreadable_ambient() {
+    use std::{fs::DirBuilder, os::unix::fs::DirBuilderExt};
+
+    let dir = tempfile::tempdir().unwrap();
+
+    let mut options = DirBuilder::new();
+    options.mode(0o000);
+    check!(options.create(dir.path().join("dir")));
+
+    // FreeBSD seems able to open directories with 0o000 permissions.
+    if cfg!(any(
+        target_os = "android",
+        target_os = "linux",
+        target_os = "redox",
+    )) {
+        assert!(std::fs::File::open(dir.path().join("dir")).is_err());
+        assert!(std::fs::read_dir(dir.path().join("dir")).is_err());
+        assert!(std::fs::File::open(dir.path().join("dir/.")).is_err());
+    } else if cfg!(target_os = "freebsd") {
+        check!(std::fs::File::open(dir.path().join("dir")));
+        check!(std::fs::read_dir(dir.path().join("dir")));
+        check!(std::fs::File::open(dir.path().join("dir/.")));
+    }
+}
+
 /// This test is the same as `symlink_hard_link` but uses `std::fs`'
 /// ambient API instead of `cap_std`. The purpose of this test is to
 /// confirm fundamentally OS-specific behaviors.
 #[test]
-#[cfg_attr(any(target_os = "macos", target_os = "freebsd"), ignore)] // submitted to upstream as https://github.com/rust-lang/rust/pull/78026
 fn symlink_hard_link_ambient() {
     #[cfg(unix)]
     use std::os::unix::fs::symlink;

tests/reopen.rs

@@ -1,3 +1,5 @@
+#![cfg(not(target_os = "freebsd"))] // FreeBSD can't reopen arbitrary files.
+
 #[macro_use]
 mod sys_common;
 
@@ -26,8 +28,15 @@ fn basic_reopen() {
     assert!(buf.is_empty());
 
     let mut ro = check!(file.reopen(OpenOptions::new().read(true)));
+    let mut another = check!(file.reopen(OpenOptions::new().read(true)));
     check!(ro.read_to_string(&mut buf));
     assert_eq!(buf, "hello, world");
+    buf.clear();
+    check!(another.read_to_string(&mut buf));
+    assert_eq!(buf, "hello, world");
+    buf.clear();
+    check!(another.read_to_string(&mut buf));
+    assert!(buf.is_empty());
 }
 
 /// Don't allow `reopen` to grant new permissions.