From 076b742bb7d4e26480003142002834a17176dd6e Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 15 Sep 2025 16:38:06 +0200 Subject: [PATCH] wasi:filesystem@0.3.0-rc-2025-09-16: Add tests for readdir --- .../src/bin/filesystem-read-directory.json | 3 + .../src/bin/filesystem-read-directory.rs | 67 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.json create mode 100644 tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.rs diff --git a/tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.json b/tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.json new file mode 100644 index 000000000..ff216a756 --- /dev/null +++ b/tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.json @@ -0,0 +1,3 @@ +{ + "dirs": ["fs-tests.dir"] +} diff --git a/tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.rs b/tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.rs new file mode 100644 index 000000000..a47ec043a --- /dev/null +++ b/tests/rust/wasm32-wasip3/src/bin/filesystem-read-directory.rs @@ -0,0 +1,67 @@ +use std::process; +extern crate wit_bindgen; + +wit_bindgen::generate!({ + inline: r" + package test:test; + + world test { + include wasi:filesystem/imports@0.3.0-rc-2025-09-16; + include wasi:cli/command@0.3.0-rc-2025-09-16; + } +", + additional_derives: [PartialEq, Eq, Hash, Clone], + // Work around https://github.com/bytecodealliance/wasm-tools/issues/2285. + features:["clocks-timezone"], + generate_all +}); + +use wasi::filesystem::types::Descriptor; +use wasi::filesystem::types::DirectoryEntry; +use wasi::filesystem::types::DescriptorType; + +async fn test_read_directory(dir: &Descriptor) { + // read-directory: async func() -> tuple, future>>; + let (stream, result) = dir.read_directory().await; + let mut entries = stream.collect().await; + result.await.unwrap(); + entries.sort_by_key(|e| e.name.clone()); + assert_eq!( + &entries, + &[ + DirectoryEntry { + type_: DescriptorType::RegularFile, + name: "a.txt".to_string() + }, + DirectoryEntry { + type_: DescriptorType::RegularFile, + name: "b.txt".to_string() + }, + DirectoryEntry { + type_: DescriptorType::SymbolicLink, + name: "parent".to_string() + } + ] + ); +} + +struct Component; +export!(Component); +impl exports::wasi::cli::run::Guest for Component { + async fn run() -> Result<(), ()> { + match &wasi::filesystem::preopens::get_directories()[..] { + [(dir, dirname)] if dirname == "fs-tests.dir" => { + test_read_directory(dir).await; + } + [..] => { + eprintln!("usage: run with one open dir named 'fs-tests.dir'"); + process::exit(1) + } + }; + Ok(()) + } +} + +fn main() { + unreachable!("main is a stub"); +}