From 6dde7bb8d639cafe94daf3f946cffeeec68b9f3f Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Mon, 8 May 2023 20:13:06 +0200
Subject: [PATCH] tests: use latest wasmtime for testing (#327)

This patch enables using latest version of wasmtime for testing. This
should also make it possible to running tests for wasm32-wasi-threads
in the future.
---
 .github/workflows/main.yml                         | 2 +-
 tests/general/abort.c.stderr.expected              | 4 ++--
 tests/general/abort.c.stderr.expected.filter       | 5 ++---
 tests/general/assert-fail.c.stderr.expected        | 4 ++--
 tests/general/assert-fail.c.stderr.expected.filter | 5 ++---
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 718cb423f..fb3bf377a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
             0-cache-macos-latest
         if: matrix.os == 'macos-latest'
       - name: Install wasmtime for tests
-        run: curl -f -L --retry 5 https://wasmtime.dev/install.sh | bash -s -- --version v2.0.2
+        run: curl -f -L --retry 5 https://wasmtime.dev/install.sh | bash -s -- --version v8.0.1
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
diff --git a/tests/general/abort.c.stderr.expected b/tests/general/abort.c.stderr.expected
index bfba4982d..c6ecf6a93 100644
--- a/tests/general/abort.c.stderr.expected
+++ b/tests/general/abort.c.stderr.expected
@@ -2,5 +2,5 @@ Error: failed to run main module `abort.c.---.wasm`
 
 Caused by:
     0: failed to invoke command default
-    1: wasm trap: wasm `unreachable` instruction executed
-       wasm backtrace:
+    1: error while executing at wasm backtrace:
+    2: wasm trap: wasm `unreachable` instruction executed
diff --git a/tests/general/abort.c.stderr.expected.filter b/tests/general/abort.c.stderr.expected.filter
index b9f9c6665..742503a5c 100755
--- a/tests/general/abort.c.stderr.expected.filter
+++ b/tests/general/abort.c.stderr.expected.filter
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 cat \
     | sed -e 's/main module `abort\.c\.[^`]*\.wasm`/main module `abort.c.---.wasm`/' \
-    | sed -e 's/source location: @[[:xdigit:]]*$/source location: @----/' \
-    | head -n 6
+    | sed -E '/0x[[:xdigit:]]+/d'
diff --git a/tests/general/assert-fail.c.stderr.expected b/tests/general/assert-fail.c.stderr.expected
index 806abf9f4..c179f09ad 100644
--- a/tests/general/assert-fail.c.stderr.expected
+++ b/tests/general/assert-fail.c.stderr.expected
@@ -3,5 +3,5 @@ Error: failed to run main module `assert-fail.c.---.wasm`
 
 Caused by:
     0: failed to invoke command default
-    1: wasm trap: wasm `unreachable` instruction executed
-       wasm backtrace:
+    1: error while executing at wasm backtrace:
+    2: wasm trap: wasm `unreachable` instruction executed
diff --git a/tests/general/assert-fail.c.stderr.expected.filter b/tests/general/assert-fail.c.stderr.expected.filter
index df075b130..d2213dd6b 100755
--- a/tests/general/assert-fail.c.stderr.expected.filter
+++ b/tests/general/assert-fail.c.stderr.expected.filter
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 cat \
     | sed -e 's/main module `assert-fail\.c\.[^`]*\.wasm`/main module `assert-fail.c.---.wasm`/' \
-    | sed -e 's/source location: @[[:xdigit:]]*$/source location: @----/' \
-    | head -n 7
+    | sed -E '/0x[[:xdigit:]]+/d'