Added WASI test generator command. Added new dir path rename wasi tes…

…tcase
minhyeokl · Sep 6, 2021 · 66e71fc · 66e71fc
1 parent 76e00c5
commit 66e71fc
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,7 @@ wasmer-engine-dylib = { version = "2.0.0", path = "lib/engine-dylib", optional =
 wasmer-engine-staticlib = { version = "2.0.0", path = "lib/engine-staticlib", optional = true }
 wasmer-wasi = { version = "2.0.0", path = "lib/wasi", optional = true }
 wasmer-wast = { version = "2.0.0", path = "tests/lib/wast", optional = true }
+wasi-test-generator = { version = "2.0.0", path = "tests/wasi-wast", optional = true }
 wasmer-cache = { version = "2.0.0", path = "lib/cache", optional = true }
 wasmer-types = { version = "2.0.0", path = "lib/types" }
 wasmer-middlewares = { version = "2.0.0", path = "lib/middlewares", optional = true }
@@ -50,6 +51,7 @@ members = [
     "lib/wasi-types",
     "lib/wasi-experimental-io-devices",
     "lib/types",
+    "tests/wasi-wast",
     "tests/lib/wast",
     "tests/lib/compiler-test-derive",
     "tests/integration/cli",

diff --git a/Makefile b/Makefile
@@ -573,6 +573,10 @@ test-integration:
 test-integration-ios:
 	cargo test -p wasmer-integration-tests-ios
 
+generate-wasi-tests:
+# Uncomment the following for installing the toolchain
+#   cargo run -p wasi-test-generator -- -s
+	cargo run -p wasi-test-generator -- -g
 #####
 #
 # Packaging.

diff --git a/tests/wasi-wast/Cargo.toml b/tests/wasi-wast/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasi-test-generator"
-version = "0.17.0"
+version = "2.0.0"
 description = "Tests for our WASI implementation"
 license = "MIT"
 authors = ["Wasmer Engineering Team <[email protected]>"]

diff --git a/tests/wasi-wast/src/wasi_version.rs b/tests/wasi-wast/src/wasi_version.rs
@@ -16,7 +16,7 @@ impl WasiVersion {
     pub fn get_compiler_toolchain(&self) -> &'static str {
         match self {
             WasiVersion::Unstable => "nightly-2019-09-13",
-            WasiVersion::Snapshot1 => "nightly-2019-12-18",
+            WasiVersion::Snapshot1 => "1.53.0",
         }
     }
 

diff --git a/tests/wasi-wast/src/wasitests.rs b/tests/wasi-wast/src/wasitests.rs
@@ -147,7 +147,7 @@ fn compile_wasm_for_version(
             .create(true)
             .open(&temp_wasi_rs_file_name)
             .unwrap();
-        actual_file.write_all(b"#![feature(wasi_ext)]\n").unwrap();
+        // actual_file.write_all(b"#![feature(wasi_ext)]\n").unwrap();
         actual_file.write_all(file_contents.as_bytes()).unwrap();
     }
 

diff --git a/tests/wasi-wast/wasi/snapshot1/fd_rename_path.wasm b/tests/wasi-wast/wasi/snapshot1/fd_rename_path.wasm
diff --git a/tests/wasi-wast/wasi/snapshot1/fd_rename_path.wast b/tests/wasi-wast/wasi/snapshot1/fd_rename_path.wast
@@ -0,0 +1,7 @@
+;; This file was generated by https://github.com/wasmerio/wasi-tests
+
+(wasi_test "fd_rename_path.wasm"
+  (preopens "test_fs")
+  (assert_return (i64.const 101))
+  (assert_stderr "thread 'main' panicked at 'assertion failed: fs::rename(old_path, new_path).is_ok()', /Users/syrus/Development/wasmer/tests/wasi-wast/wasi/tests/fd_rename_path.rs:10:3\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n")
+)
diff --git a/tests/wasi-wast/wasi/tests/fd_rename_path.rs b/tests/wasi-wast/wasi/tests/fd_rename_path.rs
@@ -0,0 +1,11 @@
+// WASI:
+// dir: test_fs
+
+use std::fs;
+
+fn main() {
+  let old_path = "test_fs/oldname";
+  let new_path = "test_fs/newname";
+
+  assert!(fs::rename(old_path, new_path).is_ok());
+}