Merge pull request #120 from wingo/first-wasip3-test

First wasip3 test

Author: pchickey

.github/workflows/compile-tests.yml

@@ -47,15 +47,22 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v3
 
-      - name: Install wasm32-wasip1 target for Rust
+      - name: Install nightly wasm32-wasip2 target for Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
+          toolchain: nightly
+          target: wasm32-wasip2
+
+      - name: Install stable wasm32-wasip1 target for Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
           target: wasm32-wasip1
 
       - name: Build tests
         working-directory: tests/rust
         run: |
-          ./build.py
+          ./build.py --toolchain=wasm32-wasip3:nightly
 
       - name: Upload precompiled tests
         if: matrix.os == 'ubuntu-latest'

tests/rust/build.py

@@ -15,13 +15,27 @@
                     help="print commands to be executed")
 parser.add_argument("--release", action="store_true",
                     help="build tests in release mode")
+parser.add_argument("--toolchain", action="append",
+                    help="TARGET:TOOLCHAIN, pass +TOOLCHAIN to cargo for TARGET")
 
 args = parser.parse_args()
 if args.dry_run:
     args.verbose = True
 
+TOOLCHAINS={}
+if args.toolchain is not None:
+    for toolchain_arg in args.toolchain:
+        match toolchain_arg.split(':'):
+            case (target, toolchain):
+                TOOLCHAINS[target] = toolchain
+            case arg:
+                print(f"expected --toolchain=TARGET:TOOLCHAIN, got {toolchain_arg}",
+                      file=sys.stderr)
+                sys.exit(1)
+
+CARGO = ['cargo']
 SYSTEMS = ['wasm32']
-VERSIONS = ['wasip1'] # + ['wasip2', 'wasip3']
+VERSIONS = ['wasip1', 'wasip3']
 
 def compute_target(system, version):
     return f"{system}-{version}"
@@ -74,10 +88,13 @@ def mkdir_p(path):
         target = compute_target(system, version)
         build_target = compute_build_target(system, version)
         build_mode = "release" if args.release else "debug"
+        toolchain = [f"+{TOOLCHAINS[target]}"] if target in TOOLCHAINS else []
 
-        build_args = ["cargo", "build",
-                      f"--manifest-path={BASE_DIR / target / 'Cargo.toml'}",
-                      f"--target={build_target}"]
+        build_args = CARGO + toolchain + [
+            "build",
+            f"--manifest-path={BASE_DIR / target / 'Cargo.toml'}",
+            f"--target={build_target}"
+        ]
         if args.release:
             build_args.append("--release")
         run(build_args)

tests/rust/wasm32-wasip3/.gitignore

@@ -0,0 +1 @@
+target/