Skip to content

Commit

Permalink
added workaround for windows wasi fs tests to pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@xEgoist
xEgoist committed Oct 31, 2022
1 parent 20925b2 commit 18b33d5
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 22 deletions.
39 changes: 32 additions & 7 deletions lib/std/fs.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1103,9 +1103,21 @@ pub const Dir = struct {
// Resolve absolute or CWD-relative paths to a path within a Preopen
var resolved_path_buf: [MAX_PATH_BYTES]u8 = undefined;
const resolved_path = try os.resolvePathWasi(sub_path, &resolved_path_buf);
var stats: w.filestat_t = undefined;
if (w.path_filestat_get(self.fd, w.LOOKUP_SYMLINK_FOLLOW, resolved_path.relative_path.ptr, resolved_path.relative_path.len, &stats) == .SUCCESS) {
if (stats.filetype == .DIRECTORY) {
return error.IsDir;
}
}
const fd = try os.openatWasi(resolved_path.dir_fd, resolved_path.relative_path, 0x0, 0x0, fdflags, base, 0x0);
return File{ .handle = fd };
}
var stats: w.filestat_t = undefined;
if (w.path_filestat_get(self.fd, w.LOOKUP_SYMLINK_FOLLOW, sub_path.ptr, sub_path.len, &stats) == .SUCCESS) {
if (stats.filetype == .DIRECTORY) {
return error.IsDir;
}
}
const fd = try os.openatWasi(self.fd, sub_path, 0x0, 0x0, fdflags, base, 0x0);
return File{ .handle = fd };
}
Expand Down Expand Up @@ -1270,14 +1282,27 @@ pub const Dir = struct {
if (flags.exclusive) {
oflags |= w.O.EXCL;
}
if (self.fd == os.wasi.AT.FDCWD or path.isAbsolute(sub_path)) {
var stats: w.filestat_t = undefined;
const fd = if (self.fd == os.wasi.AT.FDCWD or path.isAbsolute(sub_path)) blk: {
// Resolve absolute or CWD-relative paths to a path within a Preopen
var resolved_path_buf: [MAX_PATH_BYTES]u8 = undefined;
const resolved_path = try os.resolvePathWasi(sub_path, &resolved_path_buf);
const fd = try os.openatWasi(resolved_path.dir_fd, resolved_path.relative_path, 0x0, oflags, 0x0, base, 0x0);
return File{ .handle = fd };
}
const fd = try os.openatWasi(self.fd, sub_path, 0x0, oflags, 0x0, base, 0x0);
var path_buf: [MAX_PATH_BYTES]u8 = undefined;
const resolved_path = try os.resolvePathWasi(sub_path, &path_buf);
if (w.path_filestat_get(self.fd, w.LOOKUP_SYMLINK_FOLLOW, resolved_path.relative_path.ptr, resolved_path.relative_path.len, &stats) == .SUCCESS) {
if (stats.filetype == .DIRECTORY) {
return error.IsDir;
}
}
break :blk try os.openatWasi(resolved_path.dir_fd, resolved_path.relative_path, 0x0, oflags, 0x0, base, 0x0);
} else blk: {
if (w.path_filestat_get(self.fd, w.LOOKUP_SYMLINK_FOLLOW, sub_path.ptr, sub_path.len, &stats) == .SUCCESS) {
if (stats.filetype == .DIRECTORY) {
return error.IsDir;
}
}
break :blk try os.openatWasi(self.fd, sub_path, 0x0, oflags, 0x0, base, 0x0);
};
//errdefer close(fd);

return File{ .handle = fd };
}

Expand Down
1 change: 1 addition & 0 deletions lib/std/fs/path.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ pub fn isAbsoluteZ(path_c: [*:0]const u8) bool {
}

pub fn isAbsolute(path: []const u8) bool {
// TODO: Find a way to manage check wasi targets
if (native_os == .windows) {
return isAbsoluteWindows(path);
} else {
Expand Down
17 changes: 6 additions & 11 deletions lib/std/fs/test.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ test "file operations on directories" {
const test_dir_name = "test_dir";

try tmp_dir.dir.makeDir(test_dir_name);

try testing.expectError(error.IsDir, tmp_dir.dir.createFile(test_dir_name, .{}));
try testing.expectError(error.IsDir, tmp_dir.dir.deleteFile(test_dir_name));
switch (builtin.os.tag) {
Expand All @@ -426,7 +425,6 @@ test "file operations on directories" {
// Note: The `.mode = .read_write` is necessary to ensure the error occurs on all platforms.
// TODO: Add a read-only test as well, see https://github.com/ziglang/zig/issues/5732
try testing.expectError(error.IsDir, tmp_dir.dir.openFile(test_dir_name, .{ .mode = .read_write }));

switch (builtin.os.tag) {
.wasi, .freebsd, .netbsd, .openbsd, .dragonfly => {},
else => {
Expand Down Expand Up @@ -472,9 +470,7 @@ test "deleteDir" {
test "Dir.rename files" {
var tmp_dir = tmpDir(.{});
defer tmp_dir.cleanup();

try testing.expectError(error.FileNotFound, tmp_dir.dir.rename("missing_file_name", "something_else"));

// Renaming files
const test_file_name = "test_file";
const renamed_test_file_name = "test_file_renamed";
Expand All @@ -489,12 +485,10 @@ test "Dir.rename files" {

// Rename to self succeeds
try tmp_dir.dir.rename(renamed_test_file_name, renamed_test_file_name);

// Rename to existing file succeeds
var existing_file = try tmp_dir.dir.createFile("existing_file", .{ .read = true });
existing_file.close();
try tmp_dir.dir.rename(renamed_test_file_name, "existing_file");

try testing.expectError(error.FileNotFound, tmp_dir.dir.openFile(renamed_test_file_name, .{}));
file = try tmp_dir.dir.openFile("existing_file", .{});
file.close();
Expand Down Expand Up @@ -529,7 +523,8 @@ test "Dir.rename directories" {

test "Dir.rename directory onto empty dir" {
// TODO: Fix on Windows, see https://github.com/ziglang/zig/issues/6364
if (builtin.os.tag == .windows) return error.SkipZigTest;
// TODO: Using wasmtime on windows will cause AccessDenied error. Becuase of calling MoveFileEx
if (builtin.os.tag == .windows or builtin.os.tag == .wasi) return error.SkipZigTest;

var tmp_dir = testing.tmpDir(.{});
defer tmp_dir.cleanup();
Expand All @@ -546,7 +541,7 @@ test "Dir.rename directory onto empty dir" {

test "Dir.rename directory onto non-empty dir" {
// TODO: Fix on Windows, see https://github.com/ziglang/zig/issues/6364
if (builtin.os.tag == .windows) return error.SkipZigTest;
if (builtin.os.tag == .windows or builtin.os.tag == .wasi) return error.SkipZigTest;

var tmp_dir = testing.tmpDir(.{});
defer tmp_dir.cleanup();
Expand All @@ -560,15 +555,14 @@ test "Dir.rename directory onto non-empty dir" {

// Rename should fail with PathAlreadyExists if target_dir is non-empty
try testing.expectError(error.PathAlreadyExists, tmp_dir.dir.rename("test_dir", "target_dir"));

// Ensure the directory was not renamed
var dir = try tmp_dir.dir.openDir("test_dir", .{});
dir.close();
}

test "Dir.rename file <-> dir" {
// TODO: Fix on Windows, see https://github.com/ziglang/zig/issues/6364
if (builtin.os.tag == .windows) return error.SkipZigTest;
if (builtin.os.tag == .windows or builtin.os.tag == .wasi) return error.SkipZigTest;

This comment has been minimized.

Sign in to view

Copy link
@xEgoist

xEgoist Oct 31, 2022

Author Owner

MoveFileEx will cause AccessDenied error due to dir. This shouldn't be part of the PR if submitted

var tmp_dir = tmpDir(.{});
defer tmp_dir.cleanup();
Expand Down Expand Up @@ -694,7 +688,8 @@ test "makePath, put some files in it, deleteTreeMinStackSize" {
}

test "makePath in a directory that no longer exists" {
if (builtin.os.tag == .windows) return error.SkipZigTest; // Windows returns FileBusy if attempting to remove an open dir
//TODO: WASI will behave the same way as windows due to calling the same kernel32 function
if (builtin.os.tag == .windows or builtin.os.tag == .wasi) return error.SkipZigTest; // Windows returns FileBusy if attempting to remove an open dir

var tmp = tmpDir(.{});
defer tmp.cleanup();
Expand Down
34 changes: 30 additions & 4 deletions lib/std/os.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub const MMAP2_UNIT = system.MMAP2_UNIT;
pub const MSG = system.MSG;
pub const NAME_MAX = system.NAME_MAX;
pub const O = switch (builtin.os.tag) {
// We want to expose the POSIX-like OFLAGS, so we use std.c.wasi.O instead
// We want to expose the POSIX-like OFLAGS, so we use std.c.O instead
// of std.os.wasi.O, which is for non-POSIX-like `wasi.path_open`, etc.
.wasi => std.c.O,
else => system.O,
Expand Down Expand Up @@ -2438,10 +2438,18 @@ pub fn unlinkat(dirfd: fd_t, file_path: []const u8, flags: u32) UnlinkatError!vo
/// See also `unlinkat`.
pub fn unlinkatWasi(dirfd: fd_t, file_path: []const u8, flags: u32) UnlinkatError!void {
const remove_dir = (flags & AT.REMOVEDIR) != 0;
const res = if (remove_dir)
const res: wasi.errno_t =
if (remove_dir)
wasi.path_remove_directory(dirfd, file_path.ptr, file_path.len)
else
wasi.path_unlink_file(dirfd, file_path.ptr, file_path.len);
else blk: {
var stat: wasi.filestat_t = undefined;
if (wasi.path_filestat_get(dirfd, wasi.LOOKUP_SYMLINK_FOLLOW, file_path.ptr, file_path.len, &stat) == .SUCCESS) {
if (stat.filetype == .DIRECTORY) {
break :blk .ISDIR;
}
}
break :blk wasi.path_unlink_file(dirfd, file_path.ptr, file_path.len);
};
switch (res) {
.SUCCESS => return,
.ACCES => return error.AccessDenied,
Expand Down Expand Up @@ -2595,6 +2603,8 @@ pub fn renameat(
const new_path_w = try windows.sliceToPrefixedFileW(new_path);
return renameatW(old_dir_fd, old_path_w.span(), new_dir_fd, new_path_w.span(), windows.TRUE);
} else if (builtin.os.tag == .wasi and !builtin.link_libc) {
var old_stats: wasi.filestat_t = undefined;
var new_stats: wasi.filestat_t = undefined;
var resolve_old: bool = (old_dir_fd == wasi.AT.FDCWD or fs.path.isAbsolute(old_path));
var resolve_new: bool = (new_dir_fd == wasi.AT.FDCWD or fs.path.isAbsolute(new_path));

Expand All @@ -2611,8 +2621,24 @@ pub fn renameat(
if (resolve_new)
new = try resolvePathWasi(new_path, &buf_new);

if (wasi.path_filestat_get(new.dir_fd, wasi.LOOKUP_SYMLINK_FOLLOW, new.relative_path.ptr, new.relative_path.len, &new_stats) == .SUCCESS and wasi.path_filestat_get(old.dir_fd, wasi.LOOKUP_SYMLINK_FOLLOW, old.relative_path.ptr, old.relative_path.len, &old_stats) == .SUCCESS) {
if (old_stats.filetype != .DIRECTORY and new_stats.filetype == .DIRECTORY) {
return error.IsDir;
}
if (old_stats.filetype == .DIRECTORY and new_stats.filetype != .DIRECTORY) {
return error.NotDir;
}
}
return renameatWasi(old, new);
}
if (wasi.path_filestat_get(new.dir_fd, wasi.LOOKUP_SYMLINK_FOLLOW, new.relative_path.ptr, new.relative_path.len, &new_stats) == .SUCCESS and wasi.path_filestat_get(old.dir_fd, wasi.LOOKUP_SYMLINK_FOLLOW, old.relative_path.ptr, old.relative_path.len, &old_stats) == .SUCCESS) {
if (old_stats.filetype != .DIRECTORY and new_stats.filetype == .DIRECTORY) {
return error.IsDir;
}
if (old_stats.filetype == .DIRECTORY and new_stats.filetype != .DIRECTORY) {
return error.NotDir;
}
}
return renameatWasi(old, new);
} else {
const old_path_c = try toPosixPath(old_path);
Expand Down

0 comments on commit 18b33d5

Please sign in to comment.