Merge pull request #119 from wingo/fdflags-sync

path_filestat: Dynamically allow fdflags_sync to fail

Author: pchickey

tests/rust/src/bin/path_filestat.rs

@@ -1,5 +1,5 @@
 use std::{env, process};
-use wasi_tests::{assert_errno, create_tmp_dir, open_scratch_directory, TESTCONFIG};
+use wasi_tests::{assert_errno, create_tmp_dir, open_scratch_directory};
 
 unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
     let mut fdstat = wasi::fd_fdstat_get(dir_fd).expect("fd_fdstat_get");
@@ -9,69 +9,46 @@ unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
         "the scratch directory should have RIGHT_PATH_FILESTAT_GET as base right",
     );
 
-    let fdflags = if TESTCONFIG.support_fdflags_sync() {
-        wasi::FDFLAGS_APPEND | wasi::FDFLAGS_SYNC
-    } else {
-        wasi::FDFLAGS_APPEND
+    // Create a file in the scratch directory.
+    let open_file = |fdflags| -> Result<wasi::Fd, wasi::Errno> {
+        let rights = wasi::RIGHTS_FD_READ | wasi::RIGHTS_FD_WRITE |
+                     wasi::RIGHTS_PATH_FILESTAT_GET;
+        return wasi::path_open(dir_fd, 0, "file", wasi::OFLAGS_CREAT, rights, 0,
+                               fdflags);
     };
 
-    // Create a file in the scratch directory.
-    let file_fd = wasi::path_open(
-        dir_fd,
-        0,
-        "file",
-        wasi::OFLAGS_CREAT,
-        wasi::RIGHTS_FD_READ | wasi::RIGHTS_FD_WRITE | wasi::RIGHTS_PATH_FILESTAT_GET,
-        0,
-        // Pass some flags for later retrieval
-        fdflags,
-    )
-    .expect("opening a file");
+    let (file_fd, fdflags) =
+        match open_file(wasi::FDFLAGS_APPEND | wasi::FDFLAGS_SYNC) {
+            Ok(fd) => { (fd, wasi::FDFLAGS_APPEND | wasi::FDFLAGS_SYNC) }
+            Err(wasi::ERRNO_NOTSUP) => {
+                (open_file(wasi::FDFLAGS_APPEND).expect("opening file"),
+                 wasi::FDFLAGS_APPEND)
+            }
+            Err(err) => {
+                eprintln!("error opening file: {}", err);
+                process::exit(1);
+            }
+        };
+
     assert!(
         file_fd > libc::STDERR_FILENO as wasi::Fd,
         "file descriptor range check",
     );
 
     fdstat = wasi::fd_fdstat_get(file_fd).expect("fd_fdstat_get");
-    assert_eq!(
-        fdstat.fs_rights_base & wasi::RIGHTS_PATH_FILESTAT_GET,
-        0,
-        "files shouldn't have rights for path_* syscalls even if manually given",
-    );
-    assert_eq!(
-        fdstat.fs_rights_inheriting & wasi::RIGHTS_PATH_FILESTAT_GET,
-        0,
-        "files shouldn't have rights for path_* syscalls even if manually given",
-    );
     assert_eq!(
         fdstat.fs_flags & wasi::FDFLAGS_APPEND,
         wasi::FDFLAGS_APPEND,
         "file should have the APPEND fdflag used to create the file"
     );
-    if TESTCONFIG.support_fdflags_sync() {
+    if (fdflags & wasi::FDFLAGS_SYNC) != 0 {
         assert_eq!(
             fdstat.fs_flags & wasi::FDFLAGS_SYNC,
             wasi::FDFLAGS_SYNC,
             "file should have the SYNC fdflag used to create the file"
         );
     }
 
-    if !TESTCONFIG.support_fdflags_sync() {
-        assert_errno!(
-            wasi::path_open(
-                dir_fd,
-                0,
-                "file",
-                0,
-                wasi::RIGHTS_FD_READ | wasi::RIGHTS_FD_WRITE | wasi::RIGHTS_PATH_FILESTAT_GET,
-                0,
-                wasi::FDFLAGS_SYNC,
-            )
-            .expect_err("FDFLAGS_SYNC not supported by platform"),
-            wasi::ERRNO_NOTSUP
-        );
-    }
-
     // Check file size
     let file_stat = wasi::path_filestat_get(dir_fd, 0, "file").expect("reading file stats");
     assert_eq!(file_stat.size, 0, "file size should be 0");

tests/rust/src/config.rs

@@ -2,7 +2,6 @@ pub struct TestConfig {
     errno_mode: ErrnoMode,
     no_dangling_filesystem: bool,
     no_rename_dir_to_empty_dir: bool,
-    no_fdflags_sync_support: bool,
 }
 
 enum ErrnoMode {
@@ -25,13 +24,11 @@ impl TestConfig {
         };
         let no_dangling_filesystem = std::env::var("NO_DANGLING_FILESYSTEM").is_ok();
         let no_rename_dir_to_empty_dir = std::env::var("NO_RENAME_DIR_TO_EMPTY_DIR").is_ok();
-        let no_fdflags_sync_support = std::env::var("NO_FDFLAGS_SYNC_SUPPORT").is_ok();
 
         TestConfig {
             errno_mode,
             no_dangling_filesystem,
             no_rename_dir_to_empty_dir,
-            no_fdflags_sync_support,
         }
     }
     pub fn errno_expect_unix(&self) -> bool {
@@ -58,7 +55,4 @@ impl TestConfig {
     pub fn support_rename_dir_to_empty_dir(&self) -> bool {
         !self.no_rename_dir_to_empty_dir
     }
-    pub fn support_fdflags_sync(&self) -> bool {
-        !self.no_fdflags_sync_support
-    }
 }