Merge pull request #124 from alexcrichton/support-no-rights

Disable some tests if rights aren't supported

Author: wingo

tests/rust/wasm32-wasip1/src/bin/fd_fdstat_set_rights.rs

@@ -1,11 +1,17 @@
 use std::{env, process};
 use wasi_tests::{
     assert_errno, create_tmp_dir, drop_rights, fd_get_rights, open_scratch_directory,
+    supports_rights,
 };
 
 const TEST_FILENAME: &'static str = "file.cleanup";
 
 unsafe fn test_fd_fdstat_set_rights(dir_fd: wasi::Fd) {
+    // For hosts that don't support rights at all skip this test.
+    if !supports_rights(dir_fd) {
+        return;
+    }
+
     let fd = wasi::path_open(
         dir_fd,
         0,

tests/rust/wasm32-wasip1/src/bin/path_link.rs

@@ -1,5 +1,7 @@
 use std::{env, process};
-use wasi_tests::{assert_errno, create_file, create_tmp_dir, open_scratch_directory, TESTCONFIG};
+use wasi_tests::{
+    assert_errno, create_file, create_tmp_dir, open_scratch_directory, supports_rights, TESTCONFIG,
+};
 
 const TEST_RIGHTS: wasi::Rights = wasi::RIGHTS_FD_READ
     | wasi::RIGHTS_PATH_LINK_SOURCE
@@ -43,20 +45,24 @@ fn filestats_assert_eq(left: wasi::Filestat, right: wasi::Filestat) {
 
 // This is temporary until `wasi` implements `Debug` and `PartialEq` for
 // `wasi::Fdstat`.
-fn fdstats_assert_eq(left: wasi::Fdstat, right: wasi::Fdstat) {
+fn fdstats_assert_eq(left: wasi::Fdstat, right: wasi::Fdstat, supports_rights: bool) {
     assert_eq!(left.fs_flags, right.fs_flags, "fs_flags should be equal");
     assert_eq!(
         left.fs_filetype, right.fs_filetype,
         "fs_filetype should be equal"
     );
-    assert_eq!(
-        left.fs_rights_base, right.fs_rights_base,
-        "fs_rights_base should be equal"
-    );
-    assert_eq!(
-        left.fs_rights_inheriting, right.fs_rights_inheriting,
-        "fs_rights_inheriting should be equal"
-    );
+
+    // Only tests rights if the host in general supports rights.
+    if supports_rights {
+        assert_eq!(
+            left.fs_rights_base, right.fs_rights_base,
+            "fs_rights_base should be equal"
+        );
+        assert_eq!(
+            left.fs_rights_inheriting, right.fs_rights_inheriting,
+            "fs_rights_inheriting should be equal"
+        );
+    }
 }
 
 unsafe fn check_rights(orig_fd: wasi::Fd, link_fd: wasi::Fd) {
@@ -68,7 +74,7 @@ unsafe fn check_rights(orig_fd: wasi::Fd, link_fd: wasi::Fd) {
     // Compare Fdstats
     let orig_fdstat = wasi::fd_fdstat_get(orig_fd).expect("reading fdstat of the source");
     let link_fdstat = wasi::fd_fdstat_get(link_fd).expect("reading fdstat of the link");
-    fdstats_assert_eq(orig_fdstat, link_fdstat);
+    fdstats_assert_eq(orig_fdstat, link_fdstat, supports_rights(orig_fd));
 }
 
 // Extra calls of fd_close are needed for Windows, which will not remove

tests/rust/wasm32-wasip1/src/lib.rs

@@ -175,3 +175,11 @@ macro_rules! assert_errno {
         }
     };
 }
+
+pub unsafe fn supports_rights(fd: wasi::Fd) -> bool {
+    let fd_stat = wasi::fd_fdstat_get(fd).expect("fd_fdstat_get failed");
+    match wasi::fd_fdstat_set_rights(fd, fd_stat.fs_rights_base, fd_stat.fs_rights_inheriting) {
+        Err(wasi::ERRNO_NOTSUP) => false,
+        _ => true,
+    }
+}