From 89a927be1eb5ac11de148863fcf5fae9c28ce84e Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 5 Nov 2024 19:22:40 +0100
Subject: [PATCH] Fix for wasm

---
 .github/workflows/checks.yaml | 6 ++++--
 qemu-cargo-config.toml        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index 92ae826a9..99b39f3f0 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -338,8 +338,10 @@ jobs:
           curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sdk-24.0-x86_64-linux.tar.gz | tar xz
       - name: cargo nextest (without SIMD)
         run: |
-          export CMAKE_TOOLCHAIN_FILE="$(pwd)/wasi-sdk-24.0-x86_64-linux/share/cmake/wasi-sdk.cmake"
-          cargo nextest run -p libbzip2-rs -p test-libbzip2-rs-sys --target wasm32-wasip1
+          export CC="$(pwd)/wasi-sdk-24.0-x86_64-linux/bin/clang"
+          export CFLAGS="-target wasm32-wasip1"
+          cargo nextest run -p libbzip2-rs-sys -p test-libbzip2-rs-sys --target wasm32-wasip1 \
+            -- --skip high_level_write --skip open_and_close # These tests use temp_dir
         env:
           RUST_BACKTRACE: 1
           RUSTFLAGS: ""
diff --git a/qemu-cargo-config.toml b/qemu-cargo-config.toml
index 441291fc4..150bb803c 100644
--- a/qemu-cargo-config.toml
+++ b/qemu-cargo-config.toml
@@ -8,4 +8,4 @@ linker = "s390x-linux-gnu-gcc"
 linker = "i686-linux-gnu-gcc"
 
 [target.wasm32-wasip1]
-runner = "/home/runner/.wasmtime/bin/wasmtime"
+runner = "/home/runner/.wasmtime/bin/wasmtime run --dir ../tests"