Adjust tests

.github/workflows/tests.yml

@@ -148,7 +148,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        export CFLAGS="-DM3_APP_MAX_STACK=2097152 -Dd_m3LogOutput=0"
+        export CFLAGS="-Dd_m3LogOutput=0"
         cmake ..
     - name: Build (native)
       run: |
@@ -157,11 +157,11 @@ jobs:
       run: |
         cd test
         cp ../build-wasi/wasm3.wasm ./
-        python3 run-spec-test.py --exec "../build/wasm3 ../build-wasi/wasm3.wasm --repl"
+        python3 run-spec-test.py --exec "../build/wasm3 --stack-size 2097152 ../build-wasi/wasm3.wasm --repl"
     - name: Test WASI apps (in Wasm3, self-hosting)
       run: |
         cd test
-        python3 run-wasi-test.py --fast --exec "../build/wasm3 ../build-wasi/wasm3.wasm"
+        python3 run-wasi-test.py --fast --exec "../build/wasm3 --stack-size 2097152 ../build-wasi/wasm3.wasm"
 
   build-ios:
     runs-on: macos-latest

test/run-spec-test.py

@@ -304,7 +304,7 @@ blacklist = Blacklist([
   "names.wast:* *.wasm \\x00*", # names that start with '\0'
 ])
 
-if wasm3_ver in Blacklist(["* MSVC *, x86\n", "* Clang * for Windows, x86\n"]):
+if wasm3_ver in Blacklist(["* on x86\n* MSVC *", "* on x86\n* Clang * for Windows"]):
     warning("Win32 x86 has i64->f32 conversion precision issues, skipping some tests", True)
     # See: https://docs.microsoft.com/en-us/cpp/c-runtime-library/floating-point-support
     blacklist.add([
@@ -312,13 +312,13 @@ if wasm3_ver in Blacklist(["* MSVC *, x86\n", "* Clang * for Windows, x86\n"]):
       "conversions.wast:* f32.convert_i64_u(9223371761976868863)",
       "conversions.wast:* f32.convert_i64_u(9223372586610589697)",
     ])
-elif wasm3_ver in Blacklist(["* GCC *, mips*"]):
+elif wasm3_ver in Blacklist(["* on mips* GCC *"]):
     warning("MIPS has NaN representation issues, skipping some tests", True)
     blacklist.add([
       "float_exprs.wast:* *_nan_bitpattern(*",
       "float_exprs.wast:* *no_fold_*",
     ])
-elif wasm3_ver in Blacklist(["* GCC *, sparc*"]):
+elif wasm3_ver in Blacklist(["* on sparc* GCC *"]):
     warning("SPARC has NaN representation issues, skipping some tests", True)
     blacklist.add([
       "float_exprs.wast:* *.canonical_nan_bitpattern(0, 0)",