From 1e75d49c4860a8bdecb88b0963cdc23d02aaf7a3 Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Mon, 20 May 2024 11:37:19 +0000 Subject: [PATCH 1/2] Revert "make path_create_directory return error if no dir was created" This reverts commit 1f44a86acd3a30c17b6fae4f5d7f2a1e9209434f. --- lib/wasix/src/syscalls/wasi/path_create_directory.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/wasix/src/syscalls/wasi/path_create_directory.rs b/lib/wasix/src/syscalls/wasi/path_create_directory.rs index bf20379e261..b7263ff21c5 100644 --- a/lib/wasix/src/syscalls/wasi/path_create_directory.rs +++ b/lib/wasix/src/syscalls/wasi/path_create_directory.rs @@ -84,7 +84,6 @@ pub(crate) fn path_create_directory_internal( return Err(Errno::Inval); } - let mut created_dir = false; let mut cur_dir_inode = working_dir.inode; for comp in &path_vec { let processing_cur_dir_inode = cur_dir_inode.clone(); @@ -126,7 +125,6 @@ pub(crate) fn path_create_directory_internal( return Err(Errno::Notdir); } } else { - created_dir = true; state.fs_create_dir(&adjusted_path)?; } let kind = Kind::Dir { @@ -162,9 +160,5 @@ pub(crate) fn path_create_directory_internal( } } - if created_dir { - Ok(()) - } else { - Err(Errno::Exist) - } + Ok(()) } From e7118297dadecc013f7fecc6b1c52f14364a4820 Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Mon, 20 May 2024 12:40:21 +0000 Subject: [PATCH 2/2] Skip the (now failing) fs_create_dir_existing-directory test --- tests/wasi-fyi/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wasi-fyi/test.sh b/tests/wasi-fyi/test.sh index 5d5214b7b24..20f586139b0 100755 --- a/tests/wasi-fyi/test.sh +++ b/tests/wasi-fyi/test.sh @@ -6,7 +6,7 @@ bash build.sh status=0 # Define skip list as an array -SKIP_LIST=() +SKIP_LIST=("fs_create_dir-existing-directory.wasm") # List and process .foo files for file in *.wasm; do