diff --git a/Cargo.lock b/Cargo.lock index f5bd1eaae..2c1dd2b47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,14 +30,6 @@ version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" -[[package]] -name = "api-tests" -version = "0.16.2" -dependencies = [ - "wabt", - "wasmer", -] - [[package]] name = "arrayref" version = "0.3.6" @@ -761,6 +753,14 @@ version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +[[package]] +name = "generate-wasi-tests" +version = "0.16.2" +dependencies = [ + "glob 0.3.0", + "tempfile", +] + [[package]] name = "generational-arena" version = "0.2.7" @@ -2739,8 +2739,10 @@ version = "0.16.2" dependencies = [ "atty", "byteorder", + "criterion", "errno", "fern", + "generate-wasi-tests", "glob 0.3.0", "log", "rustc_version", @@ -2756,13 +2758,11 @@ dependencies = [ "wasmer-kernel-loader", "wasmer-llvm-backend", "wasmer-middleware-common", - "wasmer-middleware-common-tests", "wasmer-runtime", "wasmer-runtime-core", "wasmer-singlepass-backend", "wasmer-wasi", "wasmer-wasi-experimental-io-devices", - "wasmer-wasi-tests", ] [[package]] @@ -2887,16 +2887,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "wasmer-llvm-backend-tests" -version = "0.10.2" -dependencies = [ - "wabt", - "wasmer-llvm-backend", - "wasmer-runtime", - "wasmer-runtime-core", -] - [[package]] name = "wasmer-middleware-common" version = "0.16.2" @@ -2904,19 +2894,6 @@ dependencies = [ "wasmer-runtime-core", ] -[[package]] -name = "wasmer-middleware-common-tests" -version = "0.16.2" -dependencies = [ - "criterion", - "wabt", - "wasmer-clif-backend", - "wasmer-llvm-backend", - "wasmer-middleware-common", - "wasmer-runtime-core", - "wasmer-singlepass-backend", -] - [[package]] name = "wasmer-runtime" version = "0.16.2" @@ -2974,17 +2951,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "wasmer-runtime-core-tests" -version = "0.16.2" -dependencies = [ - "wabt", - "wasmer-clif-backend", - "wasmer-llvm-backend", - "wasmer-runtime-core", - "wasmer-singlepass-backend", -] - [[package]] name = "wasmer-singlepass-backend" version = "0.16.2" @@ -3044,20 +3010,6 @@ dependencies = [ "wasmer-wasi", ] -[[package]] -name = "wasmer-wasi-tests" -version = "0.16.2" -dependencies = [ - "glob 0.3.0", - "tempfile", - "wasmer-clif-backend", - "wasmer-dev-utils", - "wasmer-llvm-backend", - "wasmer-runtime", - "wasmer-singlepass-backend", - "wasmer-wasi", -] - [[package]] name = "wasmer-win-exception-handler" version = "0.16.2" diff --git a/Cargo.toml b/Cargo.toml index ff1ae6889..94254f7b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,49 +38,48 @@ wasmer-llvm-backend = { path = "lib/llvm-backend", optional = true } wasmer-wasi = { path = "lib/wasi", optional = true } wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true } wasmer-dev-utils = { path = "lib/dev-utils", optional = true } -wasmer-wasi-tests = { path = "lib/wasi-tests", optional = true } -wasmer-middleware-common-tests = { path = "lib/middleware-common-tests", optional = true } wasmer-emscripten-tests = { path = "lib/emscripten-tests", optional = true } wasmer-wasi-experimental-io-devices = { path = "lib/wasi-experimental-io-devices", optional = true } [workspace] members = [ "lib/api", - "lib/api-tests", "lib/clif-backend", "lib/singlepass-backend", "lib/runtime", "lib/runtime-core", - "lib/runtime-core-tests", "lib/emscripten", "lib/spectests", "lib/win-exception-handler", "lib/runtime-c-api", "lib/llvm-backend", - "lib/llvm-backend-tests", "lib/wasi", "lib/middleware-common", "lib/kernel-loader", "lib/kernel-net", "lib/dev-utils", "lib/wasi-experimental-io-devices", - "lib/wasi-tests", "lib/emscripten-tests", - "lib/middleware-common-tests", "lib/interface-types", "examples/parallel", "examples/plugin-for-example", "examples/parallel-guest", + "tests/generate-wasi-tests", ] [build-dependencies] wabt = "0.9.1" +generate-wasi-tests = { path = "tests/generate-wasi-tests" } glob = "0.3" rustc_version = "0.2" [dev-dependencies] +criterion = "0.3" +glob = "0.3" serde = { version = "1", features = ["derive"] } # used by the plugin example typetag = "0.1" # used by the plugin example +wabt = "0.9.1" +wasmer-dev-utils = { path = "lib/dev-utils" } [features] default = ["fast-tests", "wasi", "backend-cranelift", "wabt"] @@ -95,18 +94,15 @@ backend-cranelift = [ "wasmer-clif-backend/generate-debug-information", "wasmer-runtime-core/generate-debug-information", "wasmer-runtime/cranelift", - "wasmer-middleware-common-tests/clif", ] backend-llvm = [ "wasmer-llvm-backend", "wasmer-runtime/llvm", - "wasmer-middleware-common-tests/llvm", "wasmer-runtime-core/generate-debug-information-no-export-symbols" ] backend-singlepass = [ "wasmer-singlepass-backend", "wasmer-runtime/singlepass", - "wasmer-middleware-common-tests/singlepass", ] wasi = ["wasmer-wasi"] experimental-io-devices = ["wasmer-wasi-experimental-io-devices"] @@ -118,4 +114,4 @@ crate-type = ["bin"] [[example]] name = "callback" -crate-type = ["bin"] +crate-type = ["bin"] \ No newline at end of file diff --git a/lib/middleware-common-tests/benches/metering_benchmark.rs b/benches/metering_benchmark.rs similarity index 97% rename from lib/middleware-common-tests/benches/metering_benchmark.rs rename to benches/metering_benchmark.rs index 501e0178f..838df4940 100644 --- a/lib/middleware-common-tests/benches/metering_benchmark.rs +++ b/benches/metering_benchmark.rs @@ -133,7 +133,7 @@ static WAT_GAS: &'static str = r#" (elem (i32.const 0) $f2)) "#; -#[cfg(feature = "llvm")] +#[cfg(feature = "backend-llvm")] fn get_compiler(limit: u64, metering: bool) -> impl Compiler { use wasmer_llvm_backend::ModuleCodeGenerator; use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; @@ -148,7 +148,7 @@ fn get_compiler(limit: u64, metering: bool) -> impl Compiler { c } -#[cfg(feature = "singlepass")] +#[cfg(feature = "backend-singlepass")] fn get_compiler(limit: u64, metering: bool) -> impl Compiler { use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler}; use wasmer_singlepass_backend::ModuleCodeGenerator as SinglePassMCG; @@ -162,10 +162,14 @@ fn get_compiler(limit: u64, metering: bool) -> impl Compiler { c } -#[cfg(not(any(feature = "llvm", feature = "clif", feature = "singlepass")))] +#[cfg(not(any( + feature = "backend-llvm", + feature = "backend-cranelift", + feature = "backend-singlepass" +)))] compile_error!("compiler not specified, activate a compiler via features"); -#[cfg(feature = "clif")] +#[cfg(feature = "backend-cranelift")] fn get_compiler(_limit: u64, metering: bool) -> impl Compiler { compile_error!("cranelift does not implement metering"); use wasmer_clif_backend::CraneliftCompiler; diff --git a/build.rs b/build.rs new file mode 100644 index 000000000..b0df199ee --- /dev/null +++ b/build.rs @@ -0,0 +1,9 @@ +//! A kind of meta-build.rs that can be configured to do different things. +//! +//! Please try to keep this file as clean as possible. + +use generate_wasi_tests; + +fn main() { + generate_wasi_tests::build(); +} diff --git a/lib/api-tests/Cargo.toml b/lib/api-tests/Cargo.toml deleted file mode 100644 index 03713b5c8..000000000 --- a/lib/api-tests/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "api-tests" -version = "0.16.2" -authors = ["The Wasmer Engineering Team "] -edition = "2018" -license = "MIT" -publish = false - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -wasmer = { version = "0.16.2", path = "../api" } - -[dev-dependencies] -wabt = "0.9.1" \ No newline at end of file diff --git a/lib/api-tests/src/lib.rs b/lib/api-tests/src/lib.rs deleted file mode 100644 index 8b1378917..000000000 --- a/lib/api-tests/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lib/llvm-backend-tests/Cargo.toml b/lib/llvm-backend-tests/Cargo.toml deleted file mode 100644 index e916850aa..000000000 --- a/lib/llvm-backend-tests/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "wasmer-llvm-backend-tests" -version = "0.10.2" -authors = ["Nick Lewycky "] -license = "MIT" -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -wabt = "0.9.1" -wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" } -wasmer-runtime = { path = "../runtime", version = "0.16.2" } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"] } - -[features] diff --git a/lib/llvm-backend-tests/src/lib.rs b/lib/llvm-backend-tests/src/lib.rs deleted file mode 100644 index ccea312aa..000000000 --- a/lib/llvm-backend-tests/src/lib.rs +++ /dev/null @@ -1,17 +0,0 @@ -#![deny( - dead_code, - nonstandard_style, - unused_imports, - unused_mut, - unused_variables, - unused_unsafe, - unreachable_patterns -)] - -pub use wabt::wat2wasm; -use wasmer_llvm_backend::LLVMCompiler; -use wasmer_runtime_core::backend::Compiler; - -pub fn get_compiler() -> impl Compiler { - LLVMCompiler::new() -} diff --git a/lib/middleware-common-tests/Cargo.toml b/lib/middleware-common-tests/Cargo.toml deleted file mode 100644 index 2a41ffc7d..000000000 --- a/lib/middleware-common-tests/Cargo.toml +++ /dev/null @@ -1,28 +0,0 @@ -[package] -name = "wasmer-middleware-common-tests" -version = "0.16.2" -authors = ["The Wasmer Engineering Team "] -edition = "2018" -repository = "https://github.com/wasmerio/wasmer" -license = "MIT" -publish = false - -[dependencies] -wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" } -wasmer-middleware-common = { path = "../middleware-common", version = "0.16.2" } -wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true } -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true } - -[features] -clif = ["wasmer-clif-backend"] -llvm = ["wasmer-llvm-backend"] -singlepass = ["wasmer-singlepass-backend"] - -[dev-dependencies] -wabt = "0.9.1" -criterion = "0.3" - -[[bench]] -name = "metering_benchmark" -harness = false diff --git a/lib/runtime-core-tests/Cargo.toml b/lib/runtime-core-tests/Cargo.toml deleted file mode 100644 index 7ea842d8c..000000000 --- a/lib/runtime-core-tests/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "wasmer-runtime-core-tests" -version = "0.16.2" -description = "Tests for the Wasmer runtime core crate" -license = "MIT" -authors = ["The Wasmer Engineering Team "] -edition = "2018" -publish = false - -[dependencies] -wabt = "0.9.1" -wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2" } -wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true } -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true } - -[features] -default = ["backend-cranelift"] -backend-cranelift = ["wasmer-clif-backend"] -backend-singlepass = ["wasmer-singlepass-backend"] -backend-llvm = ["wasmer-llvm-backend"] diff --git a/lib/wasi-tests/Cargo.toml b/lib/wasi-tests/Cargo.toml deleted file mode 100644 index 402fd5994..000000000 --- a/lib/wasi-tests/Cargo.toml +++ /dev/null @@ -1,30 +0,0 @@ -[package] -name = "wasmer-wasi-tests" -version = "0.16.2" -description = "Tests for our WASI implementation" -license = "MIT" -authors = ["The Wasmer Engineering Team "] -edition = "2018" -publish = false -build = "build/mod.rs" - -[dependencies] -# We set default features to false to be able to use the singlepass backend properly -wasmer-runtime = { path = "../runtime", version = "0.16.2", default-features = false } -wasmer-wasi = { path = "../wasi", version = "0.16.2" } -# hack to get tests to work -wasmer-clif-backend = { path = "../clif-backend", version = "0.16.2", optional = true} -wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.16.2", optional = true } -wasmer-llvm-backend = { path = "../llvm-backend", version = "0.16.2", features = ["test"], optional = true } - -[build-dependencies] -glob = "0.3" -tempfile = "3" - -[dev-dependencies] -wasmer-dev-utils = { path = "../dev-utils", version = "0.16.2"} - -[features] -clif = ["wasmer-clif-backend", "wasmer-runtime/default-backend-cranelift"] -singlepass = ["wasmer-singlepass-backend", "wasmer-runtime/default-backend-singlepass"] -llvm = ["wasmer-llvm-backend", "wasmer-runtime/default-backend-llvm"] diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_close_preopen_fd.rs b/lib/wasi-tests/tests/wasitests/snapshot1_close_preopen_fd.rs deleted file mode 100644 index e887861c8..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_close_preopen_fd.rs +++ /dev/null @@ -1,19 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -#[ignore] -fn test_snapshot1_close_preopen_fd() { - assert_wasi_output!( - "../../wasitests/snapshot1/close_preopen_fd.wasm", - "snapshot1_close_preopen_fd", - vec![], - vec![( - "hamlet".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/close_preopen_fd.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_allocate.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_allocate.rs deleted file mode 100644 index a3f1caf9d..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fd_allocate.rs +++ /dev/null @@ -1,19 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -#[ignore] -fn test_snapshot1_fd_allocate() { - assert_wasi_output!( - "../../wasitests/snapshot1/fd_allocate.wasm", - "snapshot1_fd_allocate", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/fd_allocate.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_append.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_append.rs deleted file mode 100644 index a160be58d..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fd_append.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_fd_append() { - assert_wasi_output!( - "../../wasitests/snapshot1/fd_append.wasm", - "snapshot1_fd_append", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/fd_append.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_close.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_close.rs deleted file mode 100644 index ab56e3874..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fd_close.rs +++ /dev/null @@ -1,19 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -#[ignore] -fn test_snapshot1_fd_close() { - assert_wasi_output!( - "../../wasitests/snapshot1/fd_close.wasm", - "snapshot1_fd_close", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fd_close.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_pread.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_pread.rs deleted file mode 100644 index 77ea8123e..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fd_pread.rs +++ /dev/null @@ -1,19 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -#[ignore] -fn test_snapshot1_fd_pread() { - assert_wasi_output!( - "../../wasitests/snapshot1/fd_pread.wasm", - "snapshot1_fd_pread", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fd_pread.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_read.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_read.rs deleted file mode 100644 index 58f638249..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fd_read.rs +++ /dev/null @@ -1,19 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -#[ignore] -fn test_snapshot1_fd_read() { - assert_wasi_output!( - "../../wasitests/snapshot1/fd_read.wasm", - "snapshot1_fd_read", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fd_read.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fd_sync.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fd_sync.rs deleted file mode 100644 index fcbb252a2..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fd_sync.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_fd_sync() { - assert_wasi_output!( - "../../wasitests/snapshot1/fd_sync.wasm", - "snapshot1_fd_sync", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/fd_sync.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fseek.rs b/lib/wasi-tests/tests/wasitests/snapshot1_fseek.rs deleted file mode 100644 index 8e1cbac62..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fseek.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_fseek() { - assert_wasi_output!( - "../../wasitests/snapshot1/fseek.wasm", - "snapshot1_fseek", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fseek.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_mapdir.rs b/lib/wasi-tests/tests/wasitests/snapshot1_mapdir.rs deleted file mode 100644 index 32cfae716..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_mapdir.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_mapdir() { - assert_wasi_output!( - "../../wasitests/snapshot1/mapdir.wasm", - "snapshot1_mapdir", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/mapdir.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_path_link.rs b/lib/wasi-tests/tests/wasitests/snapshot1_path_link.rs deleted file mode 100644 index ee99737b6..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_path_link.rs +++ /dev/null @@ -1,24 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_path_link() { - assert_wasi_output!( - "../../wasitests/snapshot1/path_link.wasm", - "snapshot1_path_link", - vec![], - vec![ - ( - "act5".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act5") - ), - ( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ), - ], - vec![], - "../../wasitests/path_link.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_path_rename.rs b/lib/wasi-tests/tests/wasitests/snapshot1_path_rename.rs deleted file mode 100644 index 577165f49..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_path_rename.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_path_rename() { - assert_wasi_output!( - "../../wasitests/snapshot1/path_rename.wasm", - "snapshot1_path_rename", - vec![], - vec![( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/path_rename.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_path_symlink.rs b/lib/wasi-tests/tests/wasitests/snapshot1_path_symlink.rs deleted file mode 100644 index 923619ba3..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_path_symlink.rs +++ /dev/null @@ -1,24 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_path_symlink() { - assert_wasi_output!( - "../../wasitests/snapshot1/path_symlink.wasm", - "snapshot1_path_symlink", - vec![], - vec![ - ( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ), - ( - "hamlet".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ), - ], - vec![], - "../../wasitests/path_symlink.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_poll_oneoff.rs b/lib/wasi-tests/tests/wasitests/snapshot1_poll_oneoff.rs deleted file mode 100644 index bc689194f..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_poll_oneoff.rs +++ /dev/null @@ -1,25 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -#[ignore] -fn test_snapshot1_poll_oneoff() { - assert_wasi_output!( - "../../wasitests/snapshot1/poll_oneoff.wasm", - "snapshot1_poll_oneoff", - vec![], - vec![ - ( - "hamlet".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ), - ( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ), - ], - vec![], - "../../wasitests/poll_oneoff.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_readlink.rs b/lib/wasi-tests/tests/wasitests/snapshot1_readlink.rs deleted file mode 100644 index 2b6c675b9..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_readlink.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_readlink() { - assert_wasi_output!( - "../../wasitests/snapshot1/readlink.wasm", - "snapshot1_readlink", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/readlink.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs b/lib/wasi-tests/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs deleted file mode 100644 index 626df39f9..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs +++ /dev/null @@ -1,28 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_wasi_sees_virtual_root() { - assert_wasi_output!( - "../../wasitests/snapshot1/wasi_sees_virtual_root.wasm", - "snapshot1_wasi_sees_virtual_root", - vec![], - vec![ - ( - "act1".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ( - "act2".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act2") - ), - ( - "act1-again".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ], - vec![], - "../../wasitests/wasi_sees_virtual_root.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_writing.rs b/lib/wasi-tests/tests/wasitests/snapshot1_writing.rs deleted file mode 100644 index d48cc32ed..000000000 --- a/lib/wasi-tests/tests/wasitests/snapshot1_writing.rs +++ /dev/null @@ -1,28 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_snapshot1_writing() { - assert_wasi_output!( - "../../wasitests/snapshot1/writing.wasm", - "snapshot1_writing", - vec![], - vec![ - ( - "act1".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ( - "act2".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act2") - ), - ( - "act1-again".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ], - vec![], - "../../wasitests/writing.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_close_preopen_fd.rs b/lib/wasi-tests/tests/wasitests/unstable_close_preopen_fd.rs deleted file mode 100644 index 48f26dee8..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_close_preopen_fd.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_close_preopen_fd() { - assert_wasi_output!( - "../../wasitests/unstable/close_preopen_fd.wasm", - "unstable_close_preopen_fd", - vec![], - vec![( - "hamlet".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/close_preopen_fd.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fd_allocate.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_allocate.rs deleted file mode 100644 index b3904f35a..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fd_allocate.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fd_allocate() { - assert_wasi_output!( - "../../wasitests/unstable/fd_allocate.wasm", - "unstable_fd_allocate", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/fd_allocate.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fd_append.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_append.rs deleted file mode 100644 index e23f9ec7b..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fd_append.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fd_append() { - assert_wasi_output!( - "../../wasitests/unstable/fd_append.wasm", - "unstable_fd_append", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/fd_append.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fd_close.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_close.rs deleted file mode 100644 index b2e47e364..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fd_close.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fd_close() { - assert_wasi_output!( - "../../wasitests/unstable/fd_close.wasm", - "unstable_fd_close", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fd_close.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fd_pread.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_pread.rs deleted file mode 100644 index 2661028ec..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fd_pread.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fd_pread() { - assert_wasi_output!( - "../../wasitests/unstable/fd_pread.wasm", - "unstable_fd_pread", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fd_pread.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fd_read.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_read.rs deleted file mode 100644 index dc9e90a3b..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fd_read.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fd_read() { - assert_wasi_output!( - "../../wasitests/unstable/fd_read.wasm", - "unstable_fd_read", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fd_read.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fd_sync.rs b/lib/wasi-tests/tests/wasitests/unstable_fd_sync.rs deleted file mode 100644 index b8aca4143..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fd_sync.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fd_sync() { - assert_wasi_output!( - "../../wasitests/unstable/fd_sync.wasm", - "unstable_fd_sync", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/fd_sync.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_fseek.rs b/lib/wasi-tests/tests/wasitests/unstable_fseek.rs deleted file mode 100644 index f24185fc0..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_fseek.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_fseek() { - assert_wasi_output!( - "../../wasitests/unstable/fseek.wasm", - "unstable_fseek", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/fseek.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_mapdir.rs b/lib/wasi-tests/tests/wasitests/unstable_mapdir.rs deleted file mode 100644 index 180e87996..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_mapdir.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_mapdir() { - assert_wasi_output!( - "../../wasitests/unstable/mapdir.wasm", - "unstable_mapdir", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/mapdir.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_path_link.rs b/lib/wasi-tests/tests/wasitests/unstable_path_link.rs deleted file mode 100644 index 09d9762bc..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_path_link.rs +++ /dev/null @@ -1,24 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_path_link() { - assert_wasi_output!( - "../../wasitests/unstable/path_link.wasm", - "unstable_path_link", - vec![], - vec![ - ( - "act5".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act5") - ), - ( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ), - ], - vec![], - "../../wasitests/path_link.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_path_rename.rs b/lib/wasi-tests/tests/wasitests/unstable_path_rename.rs deleted file mode 100644 index 83c558564..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_path_rename.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_path_rename() { - assert_wasi_output!( - "../../wasitests/unstable/path_rename.wasm", - "unstable_path_rename", - vec![], - vec![( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ),], - vec![], - "../../wasitests/path_rename.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_path_symlink.rs b/lib/wasi-tests/tests/wasitests/unstable_path_symlink.rs deleted file mode 100644 index 8bed0426d..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_path_symlink.rs +++ /dev/null @@ -1,24 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_path_symlink() { - assert_wasi_output!( - "../../wasitests/unstable/path_symlink.wasm", - "unstable_path_symlink", - vec![], - vec![ - ( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ), - ( - "hamlet".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ), - ], - vec![], - "../../wasitests/path_symlink.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_poll_oneoff.rs b/lib/wasi-tests/tests/wasitests/unstable_poll_oneoff.rs deleted file mode 100644 index 8fc4b1ef3..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_poll_oneoff.rs +++ /dev/null @@ -1,24 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_poll_oneoff() { - assert_wasi_output!( - "../../wasitests/unstable/poll_oneoff.wasm", - "unstable_poll_oneoff", - vec![], - vec![ - ( - "hamlet".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ), - ( - "temp".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/temp") - ), - ], - vec![], - "../../wasitests/poll_oneoff.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_readlink.rs b/lib/wasi-tests/tests/wasitests/unstable_readlink.rs deleted file mode 100644 index 66c1e1aaf..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_readlink.rs +++ /dev/null @@ -1,18 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_readlink() { - assert_wasi_output!( - "../../wasitests/unstable/readlink.wasm", - "unstable_readlink", - vec![], - vec![( - ".".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet") - ),], - vec![], - "../../wasitests/readlink.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_wasi_sees_virtual_root.rs b/lib/wasi-tests/tests/wasitests/unstable_wasi_sees_virtual_root.rs deleted file mode 100644 index df929306a..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_wasi_sees_virtual_root.rs +++ /dev/null @@ -1,28 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_wasi_sees_virtual_root() { - assert_wasi_output!( - "../../wasitests/unstable/wasi_sees_virtual_root.wasm", - "unstable_wasi_sees_virtual_root", - vec![], - vec![ - ( - "act1".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ( - "act2".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act2") - ), - ( - "act1-again".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ], - vec![], - "../../wasitests/wasi_sees_virtual_root.out" - ); -} diff --git a/lib/wasi-tests/tests/wasitests/unstable_writing.rs b/lib/wasi-tests/tests/wasitests/unstable_writing.rs deleted file mode 100644 index d964b29ff..000000000 --- a/lib/wasi-tests/tests/wasitests/unstable_writing.rs +++ /dev/null @@ -1,28 +0,0 @@ -// !!! THIS IS A GENERATED FILE !!! -// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). - -#[test] -fn test_unstable_writing() { - assert_wasi_output!( - "../../wasitests/unstable/writing.wasm", - "unstable_writing", - vec![], - vec![ - ( - "act1".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ( - "act2".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act2") - ), - ( - "act1-again".to_string(), - ::std::path::PathBuf::from("wasitests/test_fs/hamlet/act1") - ), - ], - vec![], - "../../wasitests/writing.out" - ); -} diff --git a/lib/runtime-core-tests/tests/exception_handling.rs b/tests/exception_handling.rs similarity index 87% rename from lib/runtime-core-tests/tests/exception_handling.rs rename to tests/exception_handling.rs index bf7a21a04..4001183a2 100644 --- a/lib/runtime-core-tests/tests/exception_handling.rs +++ b/tests/exception_handling.rs @@ -1,5 +1,7 @@ +mod runtime_core_tests; + +use runtime_core_tests::{get_compiler, wat2wasm}; use wasmer_runtime_core::{compile_with, imports}; -use wasmer_runtime_core_tests::{get_compiler, wat2wasm}; #[test] fn exception_handling_works() { diff --git a/tests/generate-wasi-tests/Cargo.toml b/tests/generate-wasi-tests/Cargo.toml new file mode 100644 index 000000000..2167e7c88 --- /dev/null +++ b/tests/generate-wasi-tests/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "generate-wasi-tests" +version = "0.16.2" +description = "Tests for our WASI implementation" +license = "MIT" +authors = ["The Wasmer Engineering Team "] +edition = "2018" +publish = false + +[dependencies] +glob = "0.3" +tempfile = "3" +# We set default features to false to be able to use the singlepass backend properly + +#[dev-dependencies] +#wasmer-dev-utils = { path = "../../lib/dev-utils", version = "0.16.2"} + +#[features] +#clif = ["wasmer-clif-backend", "wasmer-runtime/default-backend-cranelift"] +#singlepass = ["wasmer-singlepass-backend", "wasmer-runtime/default-backend-singlepass"] +#llvm = ["wasmer-llvm-backend", "wasmer-runtime/default-backend-llvm"] diff --git a/lib/wasi-tests/build/mod.rs b/tests/generate-wasi-tests/src/lib.rs similarity index 52% rename from lib/wasi-tests/build/mod.rs rename to tests/generate-wasi-tests/src/lib.rs index d7ad095fb..3ee64ada5 100644 --- a/lib/wasi-tests/build/mod.rs +++ b/tests/generate-wasi-tests/src/lib.rs @@ -1,14 +1,19 @@ use std::env; -mod set_up_toolchain; -mod util; -mod wasi_version; -mod wasitests; +pub mod set_up_toolchain; +pub mod util; +pub mod wasi_version; +pub mod wasitests; static WASITESTS_ENV_VAR: &str = "WASM_WASI_GENERATE_WASITESTS"; static WASITESTS_SET_UP_TOOLCHAIN: &str = "WASM_WASI_SET_UP_TOOLCHAIN"; +static WASITESTS_GENERATE_ALL: &str = "WASI_TEST_GENERATE_ALL"; -fn main() { +pub fn build() { + //println!("cargo:rerun-if-changed=tests/wasi_test_resources/*.rs"); + println!("cargo:rerun-if-env-changed={}", WASITESTS_ENV_VAR); + println!("cargo:rerun-if-env-changed={}", WASITESTS_SET_UP_TOOLCHAIN); + println!("cargo:rerun-if-env-changed={}", WASITESTS_GENERATE_ALL); let do_all_wasi_tests = util::should_operate_on_all_wasi_tests(); if env::var(WASITESTS_SET_UP_TOOLCHAIN).unwrap_or("0".to_string()) == "1" { set_up_toolchain::set_it_up(do_all_wasi_tests); diff --git a/lib/wasi-tests/build/set_up_toolchain.rs b/tests/generate-wasi-tests/src/set_up_toolchain.rs similarity index 95% rename from lib/wasi-tests/build/set_up_toolchain.rs rename to tests/generate-wasi-tests/src/set_up_toolchain.rs index 6add53c70..80cf88447 100644 --- a/lib/wasi-tests/build/set_up_toolchain.rs +++ b/tests/generate-wasi-tests/src/set_up_toolchain.rs @@ -1,5 +1,5 @@ -use crate::util; -use crate::wasi_version::*; +use super::util; +use super::wasi_version::*; use std::process::Command; diff --git a/lib/wasi-tests/build/util.rs b/tests/generate-wasi-tests/src/util.rs similarity index 100% rename from lib/wasi-tests/build/util.rs rename to tests/generate-wasi-tests/src/util.rs diff --git a/lib/wasi-tests/build/wasi_version.rs b/tests/generate-wasi-tests/src/wasi_version.rs similarity index 100% rename from lib/wasi-tests/build/wasi_version.rs rename to tests/generate-wasi-tests/src/wasi_version.rs diff --git a/lib/wasi-tests/build/wasitests.rs b/tests/generate-wasi-tests/src/wasitests.rs similarity index 87% rename from lib/wasi-tests/build/wasitests.rs rename to tests/generate-wasi-tests/src/wasitests.rs index c4d3ecb03..10caae9e0 100644 --- a/lib/wasi-tests/build/wasitests.rs +++ b/tests/generate-wasi-tests/src/wasitests.rs @@ -15,12 +15,12 @@ use std::fs::File; use std::io::prelude::*; use std::io::{self, BufReader}; -use crate::util; -use crate::wasi_version::*; +use super::util; +use super::wasi_version::*; static BANNER: &str = "// !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs).\n"; +// Files autogenerated with cargo build.\n"; /// Compile and execute the test file as native code, saving the results to be /// compared against later. @@ -56,12 +56,19 @@ fn generate_native_output(temp_dir: &Path, file: &str, normalized_name: &str) -> fs::set_permissions(&executable_path, perm)?; } + println!( + "Executing native program at {}", + executable_path.to_string_lossy() + ); + // workspace root + const EXECUTE_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../.."); let result = Command::new(&executable_path) + .current_dir(EXECUTE_DIR) .output() .expect("Failed to execute native program"); util::print_info_on_error(&result, "NATIVE PROGRAM FAILED"); - let mut output_path = executable_path.clone(); + let mut output_path = PathBuf::from(file); output_path.set_extension("out"); println!("Writing output to {}", output_path.to_string_lossy()); @@ -207,26 +214,26 @@ fn generate_test_file( #[test]{ignore} fn test_{test_name}() {{ assert_wasi_output!( - \"../../{module_path}\", + \"{module_path}\", \"{test_name}\", {dir_args}, {mapdir_args}, {envvar_args}, - \"../../{test_output_path}\" + \"{test_output_path}\" ); }} ", banner = BANNER, ignore = ignored, - module_path = wasm_out_name, + module_path = format!("../wasi_test_resources/{}.wasm", wasm_out_name), test_name = &test_name, - test_output_path = format!("wasitests/{}.out", rs_module_name), + test_output_path = format!("../wasi_test_resources/{}.out", rs_module_name), dir_args = dir_args, mapdir_args = mapdir_args, envvar_args = envvar_args ); let rust_test_filepath = format!( - concat!(env!("CARGO_MANIFEST_DIR"), "/tests/wasitests/{}.rs"), + concat!(env!("CARGO_MANIFEST_DIR"), "/../wasitests/{}.rs"), &test_name, ); fs::write(&rust_test_filepath, contents.as_bytes())?; @@ -252,18 +259,21 @@ fn compile( }; let base_dir = Path::new(file).parent().unwrap(); generate_native_output(temp_dir, &file, &rs_mod_name).expect("Generate native output"); - let mut out = vec![]; - for &version in wasi_versions { - let wasm_out_path = compile_wasm_for_version(temp_dir, file, base_dir, &rs_mod_name, version) - .expect(&format!("Could not compile Wasm to WASI version {:?}, perhaps you need to install the `{}` rust toolchain", version, version.get_compiler_toolchain())); - let wasm_out_name = wasm_out_path.to_string_lossy(); - let test_mod = generate_test_file(file, &rs_mod_name, &wasm_out_name, version, ignores) - .expect(&format!("generate test file {}", &rs_mod_name)); - out.push(test_mod); - } + wasi_versions + .into_iter() + .map(|&version| { + compile_wasm_for_version(temp_dir, file, base_dir, &rs_mod_name, version) + .expect(&format!("Could not compile Wasm to WASI version {:?}, perhaps you need to install the `{}` rust toolchain", version, version.get_compiler_toolchain())); + let wasm_out_relative_path = { + let base_path = PathBuf::from(version.get_directory_name()); + base_path.join(&rs_mod_name) + }; + let wasm_out_name = wasm_out_relative_path.to_string_lossy(); - out + generate_test_file(file, &rs_mod_name, &wasm_out_name, version, ignores) + .expect(&format!("generate test file {}", &rs_mod_name)) + }).collect::>() } fn run_prelude(should_gen_all: bool) -> &'static [WasiVersion] { @@ -284,15 +294,16 @@ fn run_prelude(should_gen_all: bool) -> &'static [WasiVersion] { } } +const WASI_TEST_SRC_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../wasi_test_resources/*.rs"); pub fn build(should_gen_all: bool) { - let rust_test_modpath = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/wasitests/mod.rs"); + let rust_test_modpath = concat!(env!("CARGO_MANIFEST_DIR"), "/../wasitests/mod.rs"); let mut modules: Vec = Vec::new(); let wasi_versions = run_prelude(should_gen_all); let temp_dir = tempfile::TempDir::new().unwrap(); let ignores = read_ignore_list(); - for entry in glob("wasitests/*.rs").unwrap() { + for entry in glob(WASI_TEST_SRC_DIR).unwrap() { match entry { Ok(path) => { let test = path.to_str().unwrap(); @@ -333,8 +344,12 @@ pub fn build(should_gen_all: bool) { } } +const IGNORE_LIST_PATH: &str = concat!( + env!("CARGO_MANIFEST_DIR"), + "/../wasi_test_resources/ignores.txt" +); fn read_ignore_list() -> HashSet { - let f = File::open("wasitests/ignores.txt").unwrap(); + let f = File::open(IGNORE_LIST_PATH).unwrap(); let f = BufReader::new(f); f.lines() .filter_map(Result::ok) diff --git a/lib/api-tests/tests/high_level_api.rs b/tests/high_level_api.rs similarity index 100% rename from lib/api-tests/tests/high_level_api.rs rename to tests/high_level_api.rs diff --git a/lib/runtime-core-tests/tests/imports.rs b/tests/imports.rs similarity index 99% rename from lib/runtime-core-tests/tests/imports.rs rename to tests/imports.rs index ca9c0cdb9..7903d433f 100644 --- a/lib/runtime-core-tests/tests/imports.rs +++ b/tests/imports.rs @@ -1,3 +1,6 @@ +mod runtime_core_tests; + +use runtime_core_tests::{get_compiler, wat2wasm}; use std::{convert::TryInto, sync::Arc}; use wasmer_runtime_core::{ compile_with, @@ -10,7 +13,6 @@ use wasmer_runtime_core::{ units::Pages, vm, DynFunc, Instance, }; -use wasmer_runtime_core_tests::{get_compiler, wat2wasm}; #[test] fn new_api_works() { diff --git a/lib/llvm-backend-tests/tests/compile.rs b/tests/llvm_compile.rs similarity index 84% rename from lib/llvm-backend-tests/tests/compile.rs rename to tests/llvm_compile.rs index 11655095b..8477d0fa4 100644 --- a/lib/llvm-backend-tests/tests/compile.rs +++ b/tests/llvm_compile.rs @@ -1,5 +1,23 @@ +#![cfg(all(feature = "backend-llvm", test))] +#![deny( + dead_code, + nonstandard_style, + unused_imports, + unused_mut, + unused_variables, + unused_unsafe, + unreachable_patterns +)] + +use wabt::wat2wasm; +use wasmer_llvm_backend::LLVMCompiler; +use wasmer_runtime_core::backend::Compiler; + +pub fn get_compiler() -> impl Compiler { + LLVMCompiler::new() +} + use wasmer_llvm_backend::{InkwellModule, LLVMBackendConfig, LLVMCallbacks}; -use wasmer_llvm_backend_tests::{get_compiler, wat2wasm}; use wasmer_runtime::{imports, CompilerConfig}; use wasmer_runtime_core::{backend::BackendCompilerConfig, compile_with, compile_with_config}; diff --git a/lib/middleware-common-tests/src/lib.rs b/tests/middleware_common.rs similarity index 94% rename from lib/middleware-common-tests/src/lib.rs rename to tests/middleware_common.rs index 70b373f4d..d5e20a1b9 100644 --- a/lib/middleware-common-tests/src/lib.rs +++ b/tests/middleware_common.rs @@ -1,4 +1,4 @@ -#[cfg(all(test, any(feature = "singlepass", feature = "llvm")))] +#[cfg(all(test, any(feature = "backend-singlepass", feature = "backend-llvm")))] mod tests { use wabt::wat2wasm; @@ -9,13 +9,13 @@ mod tests { use wasmer_runtime_core::state::CodeVersion; use wasmer_runtime_core::{backend::Compiler, compile_with, imports, Func}; - #[cfg(feature = "llvm")] + #[cfg(feature = "backend-llvm")] use wasmer_llvm_backend::ModuleCodeGenerator as MCG; - #[cfg(feature = "singlepass")] + #[cfg(feature = "backend-singlepass")] use wasmer_singlepass_backend::ModuleCodeGenerator as MCG; - #[cfg(feature = "clif")] + #[cfg(feature = "backend-cranelift")] compile_error!("cranelift does not implement metering yet"); fn get_compiler(limit: u64) -> impl Compiler { @@ -27,7 +27,11 @@ mod tests { c } - #[cfg(not(any(feature = "llvm", feature = "clif", feature = "singlepass")))] + #[cfg(not(any( + feature = "backend-llvm", + feature = "backend-cranelift", + feature = "backend-singlepass" + )))] compile_error!("compiler not specified, activate a compiler via features"); // Assemblyscript diff --git a/lib/runtime-core-tests/src/lib.rs b/tests/runtime_core_tests/mod.rs similarity index 100% rename from lib/runtime-core-tests/src/lib.rs rename to tests/runtime_core_tests/mod.rs diff --git a/lib/wasi-tests/src/lib.rs b/tests/wasi_serialization.rs similarity index 90% rename from lib/wasi-tests/src/lib.rs rename to tests/wasi_serialization.rs index 447cd40fc..8d42cc736 100644 --- a/lib/wasi-tests/src/lib.rs +++ b/tests/wasi_serialization.rs @@ -4,6 +4,8 @@ use wasmer_wasi::{state::*, *}; use std::ffi::c_void; +// TODO: fix this test! +#[ignore] #[cfg(not(feature = "singlepass"))] #[test] fn serializing_works() { @@ -15,7 +17,7 @@ fn serializing_works() { b"PATH=/bin".into_iter().cloned().collect(), b"GOROOT=$HOME/.cargo/bin".into_iter().cloned().collect(), ]; - let wasm_binary = include_bytes!("../wasitests/unstable/fd_read.wasm"); + let wasm_binary = include_bytes!("wasi_test_resources/unstable/fd_read.wasm"); let module = compile(&wasm_binary[..]) .map_err(|e| format!("Can't compile module: {:?}", e)) .unwrap(); @@ -28,7 +30,7 @@ fn serializing_works() { vec![], vec![( ".".to_string(), - std::path::PathBuf::from("wasitests/test_fs/hamlet"), + std::path::PathBuf::from("wasi_test_resources/test_fs/hamlet"), )], ); diff --git a/lib/wasi-tests/wasitests/close_preopen_fd.out b/tests/wasi_test_resources/close_preopen_fd.out similarity index 100% rename from lib/wasi-tests/wasitests/close_preopen_fd.out rename to tests/wasi_test_resources/close_preopen_fd.out diff --git a/lib/wasi-tests/wasitests/close_preopen_fd.rs b/tests/wasi_test_resources/close_preopen_fd.rs similarity index 95% rename from lib/wasi-tests/wasitests/close_preopen_fd.rs rename to tests/wasi_test_resources/close_preopen_fd.rs index ba0a87561..025c355fa 100644 --- a/lib/wasi-tests/wasitests/close_preopen_fd.rs +++ b/tests/wasi_test_resources/close_preopen_fd.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: hamlet:wasitests/test_fs/hamlet +// mapdir: hamlet:tests/wasi_test_resources/test_fs/hamlet use std::fs; use std::path::PathBuf; diff --git a/lib/wasi-tests/wasitests/create_dir.out b/tests/wasi_test_resources/create_dir.out similarity index 100% rename from lib/wasi-tests/wasitests/create_dir.out rename to tests/wasi_test_resources/create_dir.out diff --git a/lib/wasi-tests/wasitests/create_dir.rs b/tests/wasi_test_resources/create_dir.rs similarity index 100% rename from lib/wasi-tests/wasitests/create_dir.rs rename to tests/wasi_test_resources/create_dir.rs diff --git a/lib/wasi-tests/wasitests/envvar.out b/tests/wasi_test_resources/envvar.out similarity index 100% rename from lib/wasi-tests/wasitests/envvar.out rename to tests/wasi_test_resources/envvar.out diff --git a/lib/wasi-tests/wasitests/envvar.rs b/tests/wasi_test_resources/envvar.rs similarity index 100% rename from lib/wasi-tests/wasitests/envvar.rs rename to tests/wasi_test_resources/envvar.rs diff --git a/lib/wasi-tests/wasitests/fd_allocate.out b/tests/wasi_test_resources/fd_allocate.out similarity index 100% rename from lib/wasi-tests/wasitests/fd_allocate.out rename to tests/wasi_test_resources/fd_allocate.out diff --git a/lib/wasi-tests/wasitests/fd_allocate.rs b/tests/wasi_test_resources/fd_allocate.rs similarity index 97% rename from lib/wasi-tests/wasitests/fd_allocate.rs rename to tests/wasi_test_resources/fd_allocate.rs index e7bc1c631..75118502a 100644 --- a/lib/wasi-tests/wasitests/fd_allocate.rs +++ b/tests/wasi_test_resources/fd_allocate.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/temp +// mapdir: .:tests/wasi_test_resources/test_fs/temp use std::fs; #[cfg(target_os = "wasi")] diff --git a/lib/wasi-tests/wasitests/fd_append.out b/tests/wasi_test_resources/fd_append.out similarity index 100% rename from lib/wasi-tests/wasitests/fd_append.out rename to tests/wasi_test_resources/fd_append.out diff --git a/lib/wasi-tests/wasitests/fd_append.rs b/tests/wasi_test_resources/fd_append.rs similarity index 90% rename from lib/wasi-tests/wasitests/fd_append.rs rename to tests/wasi_test_resources/fd_append.rs index 2e311652e..5cf2634c1 100644 --- a/lib/wasi-tests/wasitests/fd_append.rs +++ b/tests/wasi_test_resources/fd_append.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/temp +// mapdir: .:tests/wasi_test_resources/test_fs/temp use std::fs::OpenOptions; use std::io::{Read, Write}; @@ -11,7 +11,7 @@ static STR2: &str = "Goodbye, world!\n"; fn main() { let file = { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs/temp"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs/temp"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("."); diff --git a/lib/wasi-tests/wasitests/fd_close.out b/tests/wasi_test_resources/fd_close.out similarity index 100% rename from lib/wasi-tests/wasitests/fd_close.out rename to tests/wasi_test_resources/fd_close.out diff --git a/lib/wasi-tests/wasitests/fd_close.rs b/tests/wasi_test_resources/fd_close.rs similarity index 92% rename from lib/wasi-tests/wasitests/fd_close.rs rename to tests/wasi_test_resources/fd_close.rs index e5cdaafd9..2004ebaa2 100644 --- a/lib/wasi-tests/wasitests/fd_close.rs +++ b/tests/wasi_test_resources/fd_close.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/hamlet +// mapdir: .:tests/wasi_test_resources/test_fs/hamlet use std::fs; #[cfg(target_os = "wasi")] @@ -14,7 +14,7 @@ extern "C" { fn main() { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs/hamlet"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs/hamlet"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("."); diff --git a/lib/wasi-tests/wasitests/fd_pread.out b/tests/wasi_test_resources/fd_pread.out similarity index 100% rename from lib/wasi-tests/wasitests/fd_pread.out rename to tests/wasi_test_resources/fd_pread.out diff --git a/lib/wasi-tests/wasitests/fd_pread.rs b/tests/wasi_test_resources/fd_pread.rs similarity index 93% rename from lib/wasi-tests/wasitests/fd_pread.rs rename to tests/wasi_test_resources/fd_pread.rs index 72addfdfe..e0dc0c6d4 100644 --- a/lib/wasi-tests/wasitests/fd_pread.rs +++ b/tests/wasi_test_resources/fd_pread.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/hamlet +// mapdir: .:tests/wasi_test_resources/test_fs/hamlet use std::fs; #[cfg(target_os = "wasi")] @@ -45,7 +45,7 @@ fn pread(fd: u32, iovs: &[&mut [u8]], offset: u64) -> u32 { fn main() { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs/hamlet"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs/hamlet"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("."); diff --git a/lib/wasi-tests/wasitests/fd_read.out b/tests/wasi_test_resources/fd_read.out similarity index 100% rename from lib/wasi-tests/wasitests/fd_read.out rename to tests/wasi_test_resources/fd_read.out diff --git a/lib/wasi-tests/wasitests/fd_read.rs b/tests/wasi_test_resources/fd_read.rs similarity index 93% rename from lib/wasi-tests/wasitests/fd_read.rs rename to tests/wasi_test_resources/fd_read.rs index c0a229f85..ac8e263db 100644 --- a/lib/wasi-tests/wasitests/fd_read.rs +++ b/tests/wasi_test_resources/fd_read.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/hamlet +// mapdir: .:tests/wasi_test_resources/test_fs/hamlet // this program is used in the pause/resume test @@ -46,7 +46,7 @@ fn read(fd: u32, iovs: &[&mut [u8]]) -> u32 { fn main() { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs/hamlet"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs/hamlet"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("."); diff --git a/lib/wasi-tests/wasitests/fd_sync.out b/tests/wasi_test_resources/fd_sync.out similarity index 100% rename from lib/wasi-tests/wasitests/fd_sync.out rename to tests/wasi_test_resources/fd_sync.out diff --git a/lib/wasi-tests/wasitests/fd_sync.rs b/tests/wasi_test_resources/fd_sync.rs similarity index 96% rename from lib/wasi-tests/wasitests/fd_sync.rs rename to tests/wasi_test_resources/fd_sync.rs index 58be96ef5..31489d9cf 100644 --- a/lib/wasi-tests/wasitests/fd_sync.rs +++ b/tests/wasi_test_resources/fd_sync.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/temp +// mapdir: .:tests/wasi_test_resources/test_fs/temp use std::fs; use std::path::PathBuf; diff --git a/lib/wasi-tests/wasitests/file_metadata.out b/tests/wasi_test_resources/file_metadata.out similarity index 73% rename from lib/wasi-tests/wasitests/file_metadata.out rename to tests/wasi_test_resources/file_metadata.out index faa15dc29..974bc1ff5 100644 --- a/lib/wasi-tests/wasitests/file_metadata.out +++ b/tests/wasi_test_resources/file_metadata.out @@ -1,3 +1,3 @@ is dir: false filetype: false true false -file info: 476 +file info: 493 diff --git a/lib/wasi-tests/wasitests/file_metadata.rs b/tests/wasi_test_resources/file_metadata.rs similarity index 73% rename from lib/wasi-tests/wasitests/file_metadata.rs rename to tests/wasi_test_resources/file_metadata.rs index 67c3999cc..9ae25534e 100644 --- a/lib/wasi-tests/wasitests/file_metadata.rs +++ b/tests/wasi_test_resources/file_metadata.rs @@ -5,8 +5,8 @@ use std::fs; use std::io::Read; fn main() { - let mut this_file = - fs::File::open("wasitests/file_metadata.rs").expect("could not find src file"); + let mut this_file = fs::File::open("tests/wasi_test_resources/file_metadata.rs") + .expect("could not find src file"); let md = this_file.metadata().unwrap(); println!("is dir: {}", md.is_dir()); let filetype = md.file_type(); diff --git a/lib/wasi-tests/wasitests/fs_sandbox_test.out b/tests/wasi_test_resources/fs_sandbox_test.out similarity index 100% rename from lib/wasi-tests/wasitests/fs_sandbox_test.out rename to tests/wasi_test_resources/fs_sandbox_test.out diff --git a/lib/wasi-tests/wasitests/fs_sandbox_test.rs b/tests/wasi_test_resources/fs_sandbox_test.rs similarity index 100% rename from lib/wasi-tests/wasitests/fs_sandbox_test.rs rename to tests/wasi_test_resources/fs_sandbox_test.rs diff --git a/lib/wasi-tests/wasitests/fseek.out b/tests/wasi_test_resources/fseek.out similarity index 100% rename from lib/wasi-tests/wasitests/fseek.out rename to tests/wasi_test_resources/fseek.out diff --git a/lib/wasi-tests/wasitests/fseek.rs b/tests/wasi_test_resources/fseek.rs similarity index 91% rename from lib/wasi-tests/wasitests/fseek.rs rename to tests/wasi_test_resources/fseek.rs index 9b9e9f65e..571edd3c8 100644 --- a/lib/wasi-tests/wasitests/fseek.rs +++ b/tests/wasi_test_resources/fseek.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: .:wasitests/test_fs/hamlet +// mapdir: .:tests/wasi_test_resources/test_fs/hamlet use std::fs; use std::io::{Read, Seek, SeekFrom}; @@ -7,7 +7,7 @@ use std::path::PathBuf; fn main() { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs/hamlet"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs/hamlet"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("."); diff --git a/lib/wasi-tests/wasitests/hello.out b/tests/wasi_test_resources/hello.out similarity index 100% rename from lib/wasi-tests/wasitests/hello.out rename to tests/wasi_test_resources/hello.out diff --git a/lib/wasi-tests/wasitests/hello.rs b/tests/wasi_test_resources/hello.rs similarity index 100% rename from lib/wasi-tests/wasitests/hello.rs rename to tests/wasi_test_resources/hello.rs diff --git a/lib/wasi-tests/wasitests/ignores.txt b/tests/wasi_test_resources/ignores.txt similarity index 100% rename from lib/wasi-tests/wasitests/ignores.txt rename to tests/wasi_test_resources/ignores.txt diff --git a/lib/wasi-tests/wasitests/isatty.out b/tests/wasi_test_resources/isatty.out similarity index 100% rename from lib/wasi-tests/wasitests/isatty.out rename to tests/wasi_test_resources/isatty.out diff --git a/lib/wasi-tests/wasitests/isatty.rs b/tests/wasi_test_resources/isatty.rs similarity index 100% rename from lib/wasi-tests/wasitests/isatty.rs rename to tests/wasi_test_resources/isatty.rs diff --git a/lib/wasi-tests/wasitests/mapdir.out b/tests/wasi_test_resources/mapdir.out similarity index 100% rename from lib/wasi-tests/wasitests/mapdir.out rename to tests/wasi_test_resources/mapdir.out diff --git a/lib/wasi-tests/wasitests/mapdir.rs b/tests/wasi_test_resources/mapdir.rs similarity index 69% rename from lib/wasi-tests/wasitests/mapdir.rs rename to tests/wasi_test_resources/mapdir.rs index bdf7a774b..d58a2b332 100644 --- a/lib/wasi-tests/wasitests/mapdir.rs +++ b/tests/wasi_test_resources/mapdir.rs @@ -1,11 +1,11 @@ // Args: -// mapdir: .:wasitests/test_fs/hamlet +// mapdir: .:tests/wasi_test_resources/test_fs/hamlet use std::fs; fn main() { #[cfg(not(target_os = "wasi"))] - std::env::set_current_dir("wasitests/test_fs/hamlet").unwrap(); + std::env::set_current_dir("tests/wasi_test_resources/test_fs/hamlet").unwrap(); let read_dir = fs::read_dir(".").unwrap(); let mut out = vec![]; diff --git a/lib/wasi-tests/wasitests/path_link.out b/tests/wasi_test_resources/path_link.out similarity index 100% rename from lib/wasi-tests/wasitests/path_link.out rename to tests/wasi_test_resources/path_link.out diff --git a/lib/wasi-tests/wasitests/path_link.rs b/tests/wasi_test_resources/path_link.rs similarity index 92% rename from lib/wasi-tests/wasitests/path_link.rs rename to tests/wasi_test_resources/path_link.rs index 2b9aa534e..7672a0511 100644 --- a/lib/wasi-tests/wasitests/path_link.rs +++ b/tests/wasi_test_resources/path_link.rs @@ -1,6 +1,6 @@ // Args: -// mapdir: act5:wasitests/test_fs/hamlet/act5 -// mapdir: temp:wasitests/test_fs/temp +// mapdir: act5:tests/wasi_test_resources/test_fs/hamlet/act5 +// mapdir: temp:tests/wasi_test_resources/test_fs/temp use std::fs; use std::io::Read; diff --git a/lib/wasi-tests/wasitests/path_rename.out b/tests/wasi_test_resources/path_rename.out similarity index 100% rename from lib/wasi-tests/wasitests/path_rename.out rename to tests/wasi_test_resources/path_rename.out diff --git a/lib/wasi-tests/wasitests/path_rename.rs b/tests/wasi_test_resources/path_rename.rs similarity index 93% rename from lib/wasi-tests/wasitests/path_rename.rs rename to tests/wasi_test_resources/path_rename.rs index f60eff106..29fb88b93 100644 --- a/lib/wasi-tests/wasitests/path_rename.rs +++ b/tests/wasi_test_resources/path_rename.rs @@ -1,5 +1,5 @@ // Args: -// mapdir: temp:wasitests/test_fs/temp +// mapdir: temp:tests/wasi_test_resources/test_fs/temp use std::fs; use std::io::{Read, Write}; @@ -7,7 +7,7 @@ use std::path::PathBuf; fn main() { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("/"); diff --git a/lib/wasi-tests/wasitests/path_symlink.out b/tests/wasi_test_resources/path_symlink.out similarity index 100% rename from lib/wasi-tests/wasitests/path_symlink.out rename to tests/wasi_test_resources/path_symlink.out diff --git a/lib/wasi-tests/wasitests/path_symlink.rs b/tests/wasi_test_resources/path_symlink.rs similarity index 79% rename from lib/wasi-tests/wasitests/path_symlink.rs rename to tests/wasi_test_resources/path_symlink.rs index 2c5a71c85..e06b4d16c 100644 --- a/lib/wasi-tests/wasitests/path_symlink.rs +++ b/tests/wasi_test_resources/path_symlink.rs @@ -1,6 +1,6 @@ // Args: -// mapdir: temp:wasitests/test_fs/temp -// mapdir: hamlet:wasitests/test_fs/hamlet +// mapdir: temp:tests/wasi_test_resources/test_fs/temp +// mapdir: hamlet:tests/wasi_test_resources/test_fs/hamlet use std::fs; use std::io::{Read, Seek, SeekFrom}; @@ -8,7 +8,7 @@ use std::path::PathBuf; fn main() { #[cfg(not(target_os = "wasi"))] - let mut base = PathBuf::from("wasitests/test_fs"); + let mut base = PathBuf::from("tests/wasi_test_resources/test_fs"); #[cfg(target_os = "wasi")] let mut base = PathBuf::from("/"); diff --git a/lib/wasi-tests/wasitests/poll_oneoff.out b/tests/wasi_test_resources/poll_oneoff.out similarity index 100% rename from lib/wasi-tests/wasitests/poll_oneoff.out rename to tests/wasi_test_resources/poll_oneoff.out diff --git a/lib/wasi-tests/wasitests/poll_oneoff.rs b/tests/wasi_test_resources/poll_oneoff.rs similarity index 97% rename from lib/wasi-tests/wasitests/poll_oneoff.rs rename to tests/wasi_test_resources/poll_oneoff.rs index 6170e5fb5..177ff19ae 100644 --- a/lib/wasi-tests/wasitests/poll_oneoff.rs +++ b/tests/wasi_test_resources/poll_oneoff.rs @@ -1,6 +1,6 @@ // Args: -// mapdir: hamlet:wasitests/test_fs/hamlet -// mapdir: temp:wasitests/test_fs/temp +// mapdir: hamlet:tests/wasi_test_resources/test_fs/hamlet +// mapdir: temp:tests/wasi_test_resources/test_fs/temp use std::fs; use std::io::{Read, Seek, SeekFrom}; @@ -139,7 +139,7 @@ fn poll(fds: &[u32], read: &[bool], write: &[bool]) -> Result = instance - .func("_start") + .exports + .get("_start") .map_err(|e| format!("{:?}", e)) .expect("start function in wasi module"); diff --git a/lib/wasi-tests/tests/wasitests/mod.rs b/tests/wasitests/mod.rs similarity index 95% rename from lib/wasi-tests/tests/wasitests/mod.rs rename to tests/wasitests/mod.rs index 8a3c6b27d..e3fafa621 100644 --- a/lib/wasi-tests/tests/wasitests/mod.rs +++ b/tests/wasitests/mod.rs @@ -1,6 +1,6 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. // The _common module is not autogenerated. It provides common macros for the wasitests #[macro_use] diff --git a/tests/wasitests/snapshot1_close_preopen_fd.rs b/tests/wasitests/snapshot1_close_preopen_fd.rs new file mode 100644 index 000000000..b44a3375f --- /dev/null +++ b/tests/wasitests/snapshot1_close_preopen_fd.rs @@ -0,0 +1,17 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +#[ignore] +fn test_snapshot1_close_preopen_fd() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/close_preopen_fd.wasm", + "snapshot1_close_preopen_fd", + vec![], + vec![("hamlet".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/close_preopen_fd.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_create_dir.rs b/tests/wasitests/snapshot1_create_dir.rs similarity index 63% rename from lib/wasi-tests/tests/wasitests/snapshot1_create_dir.rs rename to tests/wasitests/snapshot1_create_dir.rs index 629f7a220..b55905356 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_create_dir.rs +++ b/tests/wasitests/snapshot1_create_dir.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_create_dir() { assert_wasi_output!( - "../../wasitests/snapshot1/create_dir.wasm", + "../wasi_test_resources/snapshot1/create_dir.wasm", "snapshot1_create_dir", vec![std::path::PathBuf::from("."),], vec![], vec![], - "../../wasitests/create_dir.out" + "../wasi_test_resources/create_dir.out" ); } diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_envvar.rs b/tests/wasitests/snapshot1_envvar.rs similarity index 51% rename from lib/wasi-tests/tests/wasitests/snapshot1_envvar.rs rename to tests/wasitests/snapshot1_envvar.rs index dbac0d471..dc32954eb 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_envvar.rs +++ b/tests/wasitests/snapshot1_envvar.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_envvar() { assert_wasi_output!( - "../../wasitests/snapshot1/envvar.wasm", + "../wasi_test_resources/snapshot1/envvar.wasm", "snapshot1_envvar", vec![], vec![], - vec!["DOG=1".to_string(), "CAT=2".to_string(),], - "../../wasitests/envvar.out" + vec!["DOG=1".to_string(),"CAT=2".to_string(),], + "../wasi_test_resources/envvar.out" ); } diff --git a/tests/wasitests/snapshot1_fd_allocate.rs b/tests/wasitests/snapshot1_fd_allocate.rs new file mode 100644 index 000000000..a9a86b11c --- /dev/null +++ b/tests/wasitests/snapshot1_fd_allocate.rs @@ -0,0 +1,17 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +#[ignore] +fn test_snapshot1_fd_allocate() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fd_allocate.wasm", + "snapshot1_fd_allocate", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/fd_allocate.out" + ); +} diff --git a/tests/wasitests/snapshot1_fd_append.rs b/tests/wasitests/snapshot1_fd_append.rs new file mode 100644 index 000000000..645da14ed --- /dev/null +++ b/tests/wasitests/snapshot1_fd_append.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_fd_append() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fd_append.wasm", + "snapshot1_fd_append", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/fd_append.out" + ); +} diff --git a/tests/wasitests/snapshot1_fd_close.rs b/tests/wasitests/snapshot1_fd_close.rs new file mode 100644 index 000000000..32a46a98f --- /dev/null +++ b/tests/wasitests/snapshot1_fd_close.rs @@ -0,0 +1,17 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +#[ignore] +fn test_snapshot1_fd_close() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fd_close.wasm", + "snapshot1_fd_close", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fd_close.out" + ); +} diff --git a/tests/wasitests/snapshot1_fd_pread.rs b/tests/wasitests/snapshot1_fd_pread.rs new file mode 100644 index 000000000..95dcf7d98 --- /dev/null +++ b/tests/wasitests/snapshot1_fd_pread.rs @@ -0,0 +1,17 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +#[ignore] +fn test_snapshot1_fd_pread() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fd_pread.wasm", + "snapshot1_fd_pread", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fd_pread.out" + ); +} diff --git a/tests/wasitests/snapshot1_fd_read.rs b/tests/wasitests/snapshot1_fd_read.rs new file mode 100644 index 000000000..eb6ef923b --- /dev/null +++ b/tests/wasitests/snapshot1_fd_read.rs @@ -0,0 +1,17 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +#[ignore] +fn test_snapshot1_fd_read() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fd_read.wasm", + "snapshot1_fd_read", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fd_read.out" + ); +} diff --git a/tests/wasitests/snapshot1_fd_sync.rs b/tests/wasitests/snapshot1_fd_sync.rs new file mode 100644 index 000000000..07a7b0a32 --- /dev/null +++ b/tests/wasitests/snapshot1_fd_sync.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_fd_sync() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fd_sync.wasm", + "snapshot1_fd_sync", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/fd_sync.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_file_metadata.rs b/tests/wasitests/snapshot1_file_metadata.rs similarity index 63% rename from lib/wasi-tests/tests/wasitests/snapshot1_file_metadata.rs rename to tests/wasitests/snapshot1_file_metadata.rs index b26b5cc44..2793d3e12 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_file_metadata.rs +++ b/tests/wasitests/snapshot1_file_metadata.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_file_metadata() { assert_wasi_output!( - "../../wasitests/snapshot1/file_metadata.wasm", + "../wasi_test_resources/snapshot1/file_metadata.wasm", "snapshot1_file_metadata", vec![std::path::PathBuf::from("."),], vec![], vec![], - "../../wasitests/file_metadata.out" + "../wasi_test_resources/file_metadata.out" ); } diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_fs_sandbox_test.rs b/tests/wasitests/snapshot1_fs_sandbox_test.rs similarity index 60% rename from lib/wasi-tests/tests/wasitests/snapshot1_fs_sandbox_test.rs rename to tests/wasitests/snapshot1_fs_sandbox_test.rs index c95842a1f..600ba1b5d 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_fs_sandbox_test.rs +++ b/tests/wasitests/snapshot1_fs_sandbox_test.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_fs_sandbox_test() { assert_wasi_output!( - "../../wasitests/snapshot1/fs_sandbox_test.wasm", + "../wasi_test_resources/snapshot1/fs_sandbox_test.wasm", "snapshot1_fs_sandbox_test", vec![], vec![], vec![], - "../../wasitests/fs_sandbox_test.out" + "../wasi_test_resources/fs_sandbox_test.out" ); } diff --git a/tests/wasitests/snapshot1_fseek.rs b/tests/wasitests/snapshot1_fseek.rs new file mode 100644 index 000000000..58d2838cc --- /dev/null +++ b/tests/wasitests/snapshot1_fseek.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_fseek() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/fseek.wasm", + "snapshot1_fseek", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fseek.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_hello.rs b/tests/wasitests/snapshot1_hello.rs similarity index 61% rename from lib/wasi-tests/tests/wasitests/snapshot1_hello.rs rename to tests/wasitests/snapshot1_hello.rs index af895a2c7..0e869db15 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_hello.rs +++ b/tests/wasitests/snapshot1_hello.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_hello() { assert_wasi_output!( - "../../wasitests/snapshot1/hello.wasm", + "../wasi_test_resources/snapshot1/hello.wasm", "snapshot1_hello", vec![], vec![], vec![], - "../../wasitests/hello.out" + "../wasi_test_resources/hello.out" ); } diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_isatty.rs b/tests/wasitests/snapshot1_isatty.rs similarity index 61% rename from lib/wasi-tests/tests/wasitests/snapshot1_isatty.rs rename to tests/wasitests/snapshot1_isatty.rs index 17cdf11ae..b5d888706 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_isatty.rs +++ b/tests/wasitests/snapshot1_isatty.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_isatty() { assert_wasi_output!( - "../../wasitests/snapshot1/isatty.wasm", + "../wasi_test_resources/snapshot1/isatty.wasm", "snapshot1_isatty", vec![], vec![], vec![], - "../../wasitests/isatty.out" + "../wasi_test_resources/isatty.out" ); } diff --git a/tests/wasitests/snapshot1_mapdir.rs b/tests/wasitests/snapshot1_mapdir.rs new file mode 100644 index 000000000..e20c240da --- /dev/null +++ b/tests/wasitests/snapshot1_mapdir.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_mapdir() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/mapdir.wasm", + "snapshot1_mapdir", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/mapdir.out" + ); +} diff --git a/tests/wasitests/snapshot1_path_link.rs b/tests/wasitests/snapshot1_path_link.rs new file mode 100644 index 000000000..cf958cbdb --- /dev/null +++ b/tests/wasitests/snapshot1_path_link.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_path_link() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/path_link.wasm", + "snapshot1_path_link", + vec![], + vec![("act5".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act5")),("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/path_link.out" + ); +} diff --git a/tests/wasitests/snapshot1_path_rename.rs b/tests/wasitests/snapshot1_path_rename.rs new file mode 100644 index 000000000..1fc705c23 --- /dev/null +++ b/tests/wasitests/snapshot1_path_rename.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_path_rename() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/path_rename.wasm", + "snapshot1_path_rename", + vec![], + vec![("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/path_rename.out" + ); +} diff --git a/tests/wasitests/snapshot1_path_symlink.rs b/tests/wasitests/snapshot1_path_symlink.rs new file mode 100644 index 000000000..e8837c0e3 --- /dev/null +++ b/tests/wasitests/snapshot1_path_symlink.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_path_symlink() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/path_symlink.wasm", + "snapshot1_path_symlink", + vec![], + vec![("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),("hamlet".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/path_symlink.out" + ); +} diff --git a/tests/wasitests/snapshot1_poll_oneoff.rs b/tests/wasitests/snapshot1_poll_oneoff.rs new file mode 100644 index 000000000..c51b56469 --- /dev/null +++ b/tests/wasitests/snapshot1_poll_oneoff.rs @@ -0,0 +1,17 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +#[ignore] +fn test_snapshot1_poll_oneoff() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/poll_oneoff.wasm", + "snapshot1_poll_oneoff", + vec![], + vec![("hamlet".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/poll_oneoff.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/snapshot1_quine.rs b/tests/wasitests/snapshot1_quine.rs similarity index 64% rename from lib/wasi-tests/tests/wasitests/snapshot1_quine.rs rename to tests/wasitests/snapshot1_quine.rs index 71366923e..8389e6f1b 100644 --- a/lib/wasi-tests/tests/wasitests/snapshot1_quine.rs +++ b/tests/wasitests/snapshot1_quine.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_snapshot1_quine() { assert_wasi_output!( - "../../wasitests/snapshot1/quine.wasm", + "../wasi_test_resources/snapshot1/quine.wasm", "snapshot1_quine", vec![std::path::PathBuf::from("."),], vec![], vec![], - "../../wasitests/quine.out" + "../wasi_test_resources/quine.out" ); } diff --git a/tests/wasitests/snapshot1_readlink.rs b/tests/wasitests/snapshot1_readlink.rs new file mode 100644 index 000000000..4655b19f4 --- /dev/null +++ b/tests/wasitests/snapshot1_readlink.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_readlink() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/readlink.wasm", + "snapshot1_readlink", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/readlink.out" + ); +} diff --git a/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs b/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs new file mode 100644 index 000000000..25e160c4e --- /dev/null +++ b/tests/wasitests/snapshot1_wasi_sees_virtual_root.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_wasi_sees_virtual_root() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/wasi_sees_virtual_root.wasm", + "snapshot1_wasi_sees_virtual_root", + vec![], + vec![("act1".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),("act2".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act2")),("act1-again".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),], + vec![], + "../wasi_test_resources/wasi_sees_virtual_root.out" + ); +} diff --git a/tests/wasitests/snapshot1_writing.rs b/tests/wasitests/snapshot1_writing.rs new file mode 100644 index 000000000..c0d242563 --- /dev/null +++ b/tests/wasitests/snapshot1_writing.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_snapshot1_writing() { + assert_wasi_output!( + "../wasi_test_resources/snapshot1/writing.wasm", + "snapshot1_writing", + vec![], + vec![("act1".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),("act2".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act2")),("act1-again".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),], + vec![], + "../wasi_test_resources/writing.out" + ); +} diff --git a/tests/wasitests/unstable_close_preopen_fd.rs b/tests/wasitests/unstable_close_preopen_fd.rs new file mode 100644 index 000000000..423d7ce4b --- /dev/null +++ b/tests/wasitests/unstable_close_preopen_fd.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_close_preopen_fd() { + assert_wasi_output!( + "../wasi_test_resources/unstable/close_preopen_fd.wasm", + "unstable_close_preopen_fd", + vec![], + vec![("hamlet".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/close_preopen_fd.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/unstable_create_dir.rs b/tests/wasitests/unstable_create_dir.rs similarity index 63% rename from lib/wasi-tests/tests/wasitests/unstable_create_dir.rs rename to tests/wasitests/unstable_create_dir.rs index bda8633f5..fa3629086 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_create_dir.rs +++ b/tests/wasitests/unstable_create_dir.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_create_dir() { assert_wasi_output!( - "../../wasitests/unstable/create_dir.wasm", + "../wasi_test_resources/unstable/create_dir.wasm", "unstable_create_dir", vec![std::path::PathBuf::from("."),], vec![], vec![], - "../../wasitests/create_dir.out" + "../wasi_test_resources/create_dir.out" ); } diff --git a/lib/wasi-tests/tests/wasitests/unstable_envvar.rs b/tests/wasitests/unstable_envvar.rs similarity index 51% rename from lib/wasi-tests/tests/wasitests/unstable_envvar.rs rename to tests/wasitests/unstable_envvar.rs index 0e0a8bfdd..1df2e55f5 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_envvar.rs +++ b/tests/wasitests/unstable_envvar.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_envvar() { assert_wasi_output!( - "../../wasitests/unstable/envvar.wasm", + "../wasi_test_resources/unstable/envvar.wasm", "unstable_envvar", vec![], vec![], - vec!["DOG=1".to_string(), "CAT=2".to_string(),], - "../../wasitests/envvar.out" + vec!["DOG=1".to_string(),"CAT=2".to_string(),], + "../wasi_test_resources/envvar.out" ); } diff --git a/tests/wasitests/unstable_fd_allocate.rs b/tests/wasitests/unstable_fd_allocate.rs new file mode 100644 index 000000000..a4281eebf --- /dev/null +++ b/tests/wasitests/unstable_fd_allocate.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fd_allocate() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fd_allocate.wasm", + "unstable_fd_allocate", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/fd_allocate.out" + ); +} diff --git a/tests/wasitests/unstable_fd_append.rs b/tests/wasitests/unstable_fd_append.rs new file mode 100644 index 000000000..7f786f684 --- /dev/null +++ b/tests/wasitests/unstable_fd_append.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fd_append() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fd_append.wasm", + "unstable_fd_append", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/fd_append.out" + ); +} diff --git a/tests/wasitests/unstable_fd_close.rs b/tests/wasitests/unstable_fd_close.rs new file mode 100644 index 000000000..4f9ba5aec --- /dev/null +++ b/tests/wasitests/unstable_fd_close.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fd_close() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fd_close.wasm", + "unstable_fd_close", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fd_close.out" + ); +} diff --git a/tests/wasitests/unstable_fd_pread.rs b/tests/wasitests/unstable_fd_pread.rs new file mode 100644 index 000000000..930a332df --- /dev/null +++ b/tests/wasitests/unstable_fd_pread.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fd_pread() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fd_pread.wasm", + "unstable_fd_pread", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fd_pread.out" + ); +} diff --git a/tests/wasitests/unstable_fd_read.rs b/tests/wasitests/unstable_fd_read.rs new file mode 100644 index 000000000..876a3906a --- /dev/null +++ b/tests/wasitests/unstable_fd_read.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fd_read() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fd_read.wasm", + "unstable_fd_read", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fd_read.out" + ); +} diff --git a/tests/wasitests/unstable_fd_sync.rs b/tests/wasitests/unstable_fd_sync.rs new file mode 100644 index 000000000..9862434ce --- /dev/null +++ b/tests/wasitests/unstable_fd_sync.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fd_sync() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fd_sync.wasm", + "unstable_fd_sync", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/fd_sync.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/unstable_file_metadata.rs b/tests/wasitests/unstable_file_metadata.rs similarity index 63% rename from lib/wasi-tests/tests/wasitests/unstable_file_metadata.rs rename to tests/wasitests/unstable_file_metadata.rs index fef1e35e4..b8cc47018 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_file_metadata.rs +++ b/tests/wasitests/unstable_file_metadata.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_file_metadata() { assert_wasi_output!( - "../../wasitests/unstable/file_metadata.wasm", + "../wasi_test_resources/unstable/file_metadata.wasm", "unstable_file_metadata", vec![std::path::PathBuf::from("."),], vec![], vec![], - "../../wasitests/file_metadata.out" + "../wasi_test_resources/file_metadata.out" ); } diff --git a/lib/wasi-tests/tests/wasitests/unstable_fs_sandbox_test.rs b/tests/wasitests/unstable_fs_sandbox_test.rs similarity index 60% rename from lib/wasi-tests/tests/wasitests/unstable_fs_sandbox_test.rs rename to tests/wasitests/unstable_fs_sandbox_test.rs index 3caf3b299..f478b7e4c 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_fs_sandbox_test.rs +++ b/tests/wasitests/unstable_fs_sandbox_test.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_fs_sandbox_test() { assert_wasi_output!( - "../../wasitests/unstable/fs_sandbox_test.wasm", + "../wasi_test_resources/unstable/fs_sandbox_test.wasm", "unstable_fs_sandbox_test", vec![], vec![], vec![], - "../../wasitests/fs_sandbox_test.out" + "../wasi_test_resources/fs_sandbox_test.out" ); } diff --git a/tests/wasitests/unstable_fseek.rs b/tests/wasitests/unstable_fseek.rs new file mode 100644 index 000000000..cb457469f --- /dev/null +++ b/tests/wasitests/unstable_fseek.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_fseek() { + assert_wasi_output!( + "../wasi_test_resources/unstable/fseek.wasm", + "unstable_fseek", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/fseek.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/unstable_hello.rs b/tests/wasitests/unstable_hello.rs similarity index 61% rename from lib/wasi-tests/tests/wasitests/unstable_hello.rs rename to tests/wasitests/unstable_hello.rs index 9cbd7297b..4aa58526a 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_hello.rs +++ b/tests/wasitests/unstable_hello.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_hello() { assert_wasi_output!( - "../../wasitests/unstable/hello.wasm", + "../wasi_test_resources/unstable/hello.wasm", "unstable_hello", vec![], vec![], vec![], - "../../wasitests/hello.out" + "../wasi_test_resources/hello.out" ); } diff --git a/lib/wasi-tests/tests/wasitests/unstable_isatty.rs b/tests/wasitests/unstable_isatty.rs similarity index 61% rename from lib/wasi-tests/tests/wasitests/unstable_isatty.rs rename to tests/wasitests/unstable_isatty.rs index 781385788..07fabd454 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_isatty.rs +++ b/tests/wasitests/unstable_isatty.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_isatty() { assert_wasi_output!( - "../../wasitests/unstable/isatty.wasm", + "../wasi_test_resources/unstable/isatty.wasm", "unstable_isatty", vec![], vec![], vec![], - "../../wasitests/isatty.out" + "../wasi_test_resources/isatty.out" ); } diff --git a/tests/wasitests/unstable_mapdir.rs b/tests/wasitests/unstable_mapdir.rs new file mode 100644 index 000000000..3ca14c9e3 --- /dev/null +++ b/tests/wasitests/unstable_mapdir.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_mapdir() { + assert_wasi_output!( + "../wasi_test_resources/unstable/mapdir.wasm", + "unstable_mapdir", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/mapdir.out" + ); +} diff --git a/tests/wasitests/unstable_path_link.rs b/tests/wasitests/unstable_path_link.rs new file mode 100644 index 000000000..4158d4b0c --- /dev/null +++ b/tests/wasitests/unstable_path_link.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_path_link() { + assert_wasi_output!( + "../wasi_test_resources/unstable/path_link.wasm", + "unstable_path_link", + vec![], + vec![("act5".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act5")),("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/path_link.out" + ); +} diff --git a/tests/wasitests/unstable_path_rename.rs b/tests/wasitests/unstable_path_rename.rs new file mode 100644 index 000000000..62171d0dc --- /dev/null +++ b/tests/wasitests/unstable_path_rename.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_path_rename() { + assert_wasi_output!( + "../wasi_test_resources/unstable/path_rename.wasm", + "unstable_path_rename", + vec![], + vec![("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/path_rename.out" + ); +} diff --git a/tests/wasitests/unstable_path_symlink.rs b/tests/wasitests/unstable_path_symlink.rs new file mode 100644 index 000000000..f8f3b2c86 --- /dev/null +++ b/tests/wasitests/unstable_path_symlink.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_path_symlink() { + assert_wasi_output!( + "../wasi_test_resources/unstable/path_symlink.wasm", + "unstable_path_symlink", + vec![], + vec![("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),("hamlet".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/path_symlink.out" + ); +} diff --git a/tests/wasitests/unstable_poll_oneoff.rs b/tests/wasitests/unstable_poll_oneoff.rs new file mode 100644 index 000000000..81603d00a --- /dev/null +++ b/tests/wasitests/unstable_poll_oneoff.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_poll_oneoff() { + assert_wasi_output!( + "../wasi_test_resources/unstable/poll_oneoff.wasm", + "unstable_poll_oneoff", + vec![], + vec![("hamlet".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),("temp".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/temp")),], + vec![], + "../wasi_test_resources/poll_oneoff.out" + ); +} diff --git a/lib/wasi-tests/tests/wasitests/unstable_quine.rs b/tests/wasitests/unstable_quine.rs similarity index 64% rename from lib/wasi-tests/tests/wasitests/unstable_quine.rs rename to tests/wasitests/unstable_quine.rs index 690704395..3db685b80 100644 --- a/lib/wasi-tests/tests/wasitests/unstable_quine.rs +++ b/tests/wasitests/unstable_quine.rs @@ -1,15 +1,16 @@ // !!! THIS IS A GENERATED FILE !!! // ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME -// Files autogenerated with cargo build (build/wasitests.rs). +// Files autogenerated with cargo build. + #[test] fn test_unstable_quine() { assert_wasi_output!( - "../../wasitests/unstable/quine.wasm", + "../wasi_test_resources/unstable/quine.wasm", "unstable_quine", vec![std::path::PathBuf::from("."),], vec![], vec![], - "../../wasitests/quine.out" + "../wasi_test_resources/quine.out" ); } diff --git a/tests/wasitests/unstable_readlink.rs b/tests/wasitests/unstable_readlink.rs new file mode 100644 index 000000000..4f8449cf7 --- /dev/null +++ b/tests/wasitests/unstable_readlink.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_readlink() { + assert_wasi_output!( + "../wasi_test_resources/unstable/readlink.wasm", + "unstable_readlink", + vec![], + vec![(".".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet")),], + vec![], + "../wasi_test_resources/readlink.out" + ); +} diff --git a/tests/wasitests/unstable_wasi_sees_virtual_root.rs b/tests/wasitests/unstable_wasi_sees_virtual_root.rs new file mode 100644 index 000000000..719de8260 --- /dev/null +++ b/tests/wasitests/unstable_wasi_sees_virtual_root.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_wasi_sees_virtual_root() { + assert_wasi_output!( + "../wasi_test_resources/unstable/wasi_sees_virtual_root.wasm", + "unstable_wasi_sees_virtual_root", + vec![], + vec![("act1".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),("act2".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act2")),("act1-again".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),], + vec![], + "../wasi_test_resources/wasi_sees_virtual_root.out" + ); +} diff --git a/tests/wasitests/unstable_writing.rs b/tests/wasitests/unstable_writing.rs new file mode 100644 index 000000000..91d864070 --- /dev/null +++ b/tests/wasitests/unstable_writing.rs @@ -0,0 +1,16 @@ +// !!! THIS IS A GENERATED FILE !!! +// ANY MANUAL EDITS MAY BE OVERWRITTEN AT ANY TIME +// Files autogenerated with cargo build. + + +#[test] +fn test_unstable_writing() { + assert_wasi_output!( + "../wasi_test_resources/unstable/writing.wasm", + "unstable_writing", + vec![], + vec![("act1".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),("act2".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act2")),("act1-again".to_string(), ::std::path::PathBuf::from("tests/wasi_test_resources/test_fs/hamlet/act1")),], + vec![], + "../wasi_test_resources/writing.out" + ); +}