Merge pull request #387 from bytecodealliance/jb/revamp-fixtures

Revamp Rust project fixtures

Cargo.toml

@@ -1,7 +1,11 @@
 [workspace]
 resolver = "2"
 members = ["ext"]
-exclude = ["examples/rust-crate"]
+exclude = [
+    "examples/rust-crate",
+    "spec/fixtures/wasi-debug",
+    "spec/fixtures/wasi-deterministic",
+]
 
 [profile.release]
 codegen-units = 1 # more llvm optimizations

spec/fixtures/.gitignore

@@ -0,0 +1,2 @@
+# Ignore lockfile for fixtures to avoid irrelevant GitHub security alerts
+Cargo.lock

spec/fixtures/wasi-debug/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-wasip1"

spec/fixtures/wasi-debug/README.md

@@ -0,0 +1,11 @@
+Example WASI program used to test the WASI integration.
+
+To update:
+
+```shell
+cargo build --release && \
+    wasm-opt -O \
+    --enable-bulk-memory \
+    target/wasm32-wasip1/release/wasi-debug.wasm \
+    -o ../wasi-debug.wasm
+```

spec/fixtures/wasi-deterministic/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-wasip1"

spec/fixtures/wasi-deterministic/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "wasi-deterministic"
+version = "0.1.0"
+edition = "2021"
+
+[profile.release]
+codegen-units = 1
+opt-level = "s"
+debug = false
+strip = true
+lto = true
+
+[dependencies]
+chrono = "0.4.38"
+rand = "0.8.5"
+serde = "1.0.210"
+serde_json = "1.0.128"

spec/fixtures/wasi-deterministic/README.md

@@ -0,0 +1,12 @@
+Example WASI program used to test the WASI deterministic context integration.
+
+To update:
+
+```shell
+cargo build --release && \
+    wasm-opt -O \
+    --enable-bulk-memory \
+    target/wasm32-wasip1/release/wasi-deterministic.wasm \
+    -o ../wasi-deterministic.wasm
+```
+

spec/fixtures/deterministic.rs → spec/fixtures/wasi-deterministic/src/main.rs

@@ -1,4 +1,3 @@
-//
 // In a determinisitc build, the output of this program should be the same
 // for every execution.
 //
@@ -16,19 +15,14 @@
 //      - Elapsed time: system_time1_elapsed
 //
 //  stderr: "Error: This is an error message"
-//
-// Contributing Notes:
-//  Compile: `cargo build --target wasm32-wasi`
-//  Run: `wasmtime run target/wasm32-wasi/debug/deterministic.wasm`
-//
 
 // Import rust's io and filesystem module
+use chrono::{DateTime, Utc};
 use rand::Rng;
 use serde_json;
 use std::collections::HashMap;
 use std::thread::sleep;
 use std::time::{Duration, SystemTime};
-use chrono::{Utc, DateTime};
 
 // Entry point to our WASI applications
 fn main() {
@@ -62,7 +56,10 @@ fn main() {
         Ok(elapsed) => {
             // it prints '2'
             println!("{}", elapsed.as_secs());
-            dict.insert("system_time1_elapsed".to_string(), elapsed.as_secs().to_string());
+            dict.insert(
+                "system_time1_elapsed".to_string(),
+                elapsed.as_secs().to_string(),
+            );
         }
         Err(e) => {
             // an error occurred!

spec/unit/wasi_spec.rb

@@ -11,7 +11,7 @@ module Wasmtime
 
       # Compile module only once for speed
       @compiled_wasi_module = @engine.precompile_module(IO.binread("spec/fixtures/wasi-debug.wasm"))
-      @compiled_wasi_deterministic_module = @engine.precompile_module(IO.binread("spec/fixtures/deterministic.wasm"))
+      @compiled_wasi_deterministic_module = @engine.precompile_module(IO.binread("spec/fixtures/wasi-deterministic.wasm"))
     end
 
     describe "Linker.new" do