Merge pull request #5057 from wasmerio/add-cwd-to-manifest

Add `cwd` to the manifest as a command annotation

Cargo.toml

@@ -92,7 +92,7 @@ wasmer-config = { path = "./lib/config" }
 wasmer-wasix = { path = "./lib/wasix" }
 
 # Wasmer-owned crates
-webc = { version = "6.0.0-rc1", default-features = false, features = ["package"] }
+webc = { version = "6.0.0-rc3", default-features = false, features = ["package"] }
 edge-schema = { version = "=0.1.0" }
 shared-buffer = "0.1.4"
 

lib/wasix/src/runners/wasi.rs

@@ -354,6 +354,10 @@ impl crate::runners::Runner for WasiRunner {
             }
         }
 
+        if let Some(cwd) = &wasi.cwd {
+            env.set_current_dir(cwd);
+        }
+
         let env = env.build()?;
         let store = runtime.new_store();
 

tests/integration/cli/tests/packages/list-cwd/main.c

@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <string.h>
+
+int main(int argc, char *argv[])
+{
+    DIR *dir;
+    struct dirent *entry;
+
+    dir = opendir("./");
+    if (dir == NULL)
+    {
+        perror("opendir");
+        return 1;
+    }
+
+    while ((entry = readdir(dir)) != NULL)
+    {
+        printf("%s\n", entry->d_name);
+    }
+
+    closedir(dir);
+
+    return 0;
+}

tests/integration/cli/tests/packages/list-cwd/wasmer.toml

@@ -0,0 +1,14 @@
+[[module]]
+name = "main"
+source = "main.wasm"
+
+[fs]
+"/data" = "."
+
+[[command]]
+name = "run"
+module = "main"
+runner = "wasi"
+
+[command.annotations.wasi]
+cwd = "/data"

tests/integration/cli/tests/run.rs

@@ -47,6 +47,29 @@ static CACHE_RUST_LOG: Lazy<String> = Lazy::new(|| {
     .join(",")
 });
 
+#[test]
+fn list_cwd() {
+    let package = packages().join("list-cwd");
+
+    let output = Command::new(get_wasmer_path())
+        .arg("run")
+        .arg(package)
+        .output()
+        .unwrap();
+
+    let stdout = output.stdout;
+
+    let expected = ".
+..
+main.c
+main.wasm
+wasmer.toml
+"
+    .to_owned();
+
+    assert_eq!(expected, String::from_utf8(stdout).unwrap());
+}
+
 #[test]
 fn nested_mounted_paths() {
     let package = packages().join("nested-mounted-paths");