test: initial wasm32-wasip2 tests

Author: brianheineman

.cargo/config.toml

@@ -6,3 +6,6 @@ rustflags = ["-C", "link-arg=/STACK:8388608"]
 
 [target.wasm32-unknown-unknown]
 rustflags = ["--cfg", "getrandom_backend=\"wasm_js\""]
+
+[target.wasm32-wasip1]
+rustflags = ["-C", "link-arg=-zstack-size=8388608"]

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
             target: wasm32-unknown-unknown
           - platform: wasm32-wasi
             os: ubuntu-latest
-            target: wasm32-wasip1-threads
+            target: wasm32-wasip2
 
     steps:
       - name: Checkout source code
@@ -100,7 +100,16 @@ jobs:
           cross clippy --workspace --target ${{ matrix.target }} -- -D warnings
 
       - name: Run clippy
-        if: ${{ matrix.platform != 'wasm32-unknown' && matrix.platform != 'linux-riscv64' && matrix.platform != 'linux-s390x' }}
+        if: ${{ matrix.platform == 'wasm32-wasi' }}
+        env:
+          CARGO_TERM_COLOR: always
+          RUSTC_BOOTSTRAP: 1
+        run: |
+          rustup target install ${{ matrix.target }}
+          cargo clippy --workspace --target ${{ matrix.target }} -- -D warnings
+
+      - name: Run clippy
+        if: ${{ matrix.platform != 'wasm32-unknown' && matrix.platform != 'linux-riscv64' && matrix.platform != 'linux-s390x' && matrix.platform != 'wasm32-wasi' }}
         env:
           CARGO_TERM_COLOR: always
         run: |
@@ -125,11 +134,51 @@ jobs:
           CARGO_TERM_COLOR: always
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           RUST_BACKTRACE: 1
+          RUSTC_BOOTSTRAP: 1
           RUST_LOG: info
         run: |
           rustup target install ${{ matrix.target }}
           cargo build --workspace --target ${{ matrix.target }}
 
+      - name: Build
+        if: ${{ matrix.platform == 'linux-riscv64' || matrix.platform == 'linux-s390x' }}
+        env:
+          CARGO_TERM_COLOR: always
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUST_BACKTRACE: 1
+          RUST_LOG: info
+        run: |
+          cross build --workspace --target ${{ matrix.target }}
+
+      - name: Build
+        if: ${{ matrix.platform != 'wasm32-unknown' && matrix.platform != 'wasm32-wasi' && matrix.platform != 'linux-riscv64' && matrix.platform != 'linux-s390x' }}
+        env:
+          CARGO_TERM_COLOR: always
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUST_BACKTRACE: 1
+          RUST_LOG: info
+        run: |
+          rustup target install ${{ matrix.target }}
+          cargo build --workspace --target ${{ matrix.target }}
+
+      - name: Install wasmtime
+        if: ${{ matrix.platform == 'wasm32-wasi' }}
+        uses: taiki-e/install-action@v2
+        with:
+          tool: wasmtime
+
+      - name: Tests
+        if: ${{ matrix.platform == 'wasm32-wasi' }}
+        env:
+          CARGO_TERM_COLOR: always
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUST_BACKTRACE: 1
+          RUST_LOG: info
+          RUSTC_BOOTSTRAP: 1
+          CARGO_TARGET_WASM32_WASIP2_RUNNER: "wasmtime -W max-wasm-stack=8388608 -S http -S inherit-network -S allow-ip-name-lookup --dir=. --dir=${{ github.workspace }}::${{ github.workspace }} --env=HOME=/home --dir=${{ runner.temp }}::/home --env=TMPDIR=/tmp --dir=/tmp::/tmp"
+        run: |
+          cargo test --workspace --tests --exclude ristretto_classfile --target ${{ matrix.target }} -- --test-threads=1
+
       - name: Tests
         if: ${{ !startsWith(matrix.platform, 'wasm32') && matrix.platform != 'linux-riscv64' && matrix.platform != 'linux-s390x' && matrix.platform != 'macos-arm' }}
         env:

Cargo.lock

@@ -23,6 +23,7 @@ members = [
     "ristretto_jit",
     "ristretto_macros",
     "ristretto_pom",
+    "ristretto_test_util",
     "ristretto_types",
     "ristretto_vm",
 ]
@@ -90,6 +91,7 @@ rayon = "1.12.0"
 regex = "1.12.3"
 reqwest = "0.13.3"
 serde = "1.0.228"
+serde_json = "1.0.149"
 serde_plain = "1.0.2"
 socket2 = "0.6.3"
 stacker = "0.1.24"
@@ -99,6 +101,7 @@ sys-locale = "0.3.2"
 tar = "0.4.45"
 tempfile = "3.27.0"
 test-log = "0.2.20"
+ristretto_test_util = { path = "ristretto_test_util", version = "0.30.0" }
 thiserror = "2.0.18"
 thread-priority = "3.0.0"
 tokio = { version = "1.52.1", default-features = false, features = ["macros", "rt", "sync", "time"] }
@@ -108,6 +111,7 @@ walkdir = "2.5.0"
 wasm-bindgen-futures = "0.4.70"
 whoami = "2.1.2"
 windows-sys = { version = "0.61.2", features = ["Win32_Foundation", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_Registry", "Win32_Security"] }
+wstd = "0.6.6"
 zerocopy = "0.8.47"
 zip = { version = "8.6.0", default-features = false }
 

Cargo.toml

@@ -1,3 +1,9 @@
+[target.riscv64gc-unknown-linux-gnu]
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get install --assume-yes gcc-riscv64-linux-gnu",
+]
+
 [target.riscv64gc-unknown-linux-gnu.env]
 passthrough = [
     "PKG_CONFIG_ALLOW_CROSS=1",
@@ -6,6 +12,10 @@ passthrough = [
 
 [target.s390x-unknown-linux-gnu]
 image = "ghcr.io/cross-rs/s390x-unknown-linux-gnu:edge"
+pre-build = [
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update && apt-get install --assume-yes gcc-s390x-linux-gnu",
+]
 
 [target.s390x-unknown-linux-gnu.env]
 passthrough = [

Cross.toml

@@ -1,10 +1,8 @@
 #![forbid(unsafe_code)]
 
-#[cfg(not(target_family = "wasm"))]
 use ristretto_classloader::{JavaStr, Result, runtime};
 
 /// Example that loads a class from the Java runtime.
-#[cfg(not(target_family = "wasm"))]
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<()> {
     let (_java_home, java_version, class_loader) = runtime::version_class_loader("21").await?;
@@ -17,16 +15,10 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
-#[cfg(target_family = "wasm")]
-fn main() {
-    // Runtime class loader is not available on wasm targets
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
 
-    #[cfg(not(target_family = "wasm"))]
     #[test]
     fn test_main() -> Result<()> {
         main()

examples/runtime_class_loader/src/main.rs

@@ -1,3 +1,5 @@
+#![cfg(not(target_family = "wasm"))]
+
 mod utilities;
 
 use reqwest::Client;

ristretto_classfile/tests/jar_tests.rs

@@ -1,3 +1,5 @@
+#![cfg(not(target_family = "wasm"))]
+
 mod utilities;
 
 use anyhow::{Result, anyhow};