From 79d4913f7640399fd892e8561bb6fe895ce0f41d Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Mon, 21 Jun 2021 21:04:15 +0430 Subject: [PATCH] LibWasm: Generate all spec tests, even ones that aren't valid modules `wasm-as` will do some semantic analysis on the modules, which is not something we're looking for here. Instead, use `wat2wasm` to generate the exact module. --- .github/workflows/cmake.yml | 6 +++--- Meta/generate-libwasm-spec-test.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 9b77370ebb1..a70dcda7b94 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -196,15 +196,15 @@ jobs: run: | sudo apt-get purge -y clang-11 sudo apt-get update - sudo apt-get install ninja-build binaryen + sudo apt-get install ninja-build wabt sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100 sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100 if: ${{ runner.os == 'Linux' }} - name: Install macOS dependencies - run: brew install ninja binaryen + run: brew install ninja wabt if: ${{ runner.os == 'macOS' }} - name: Check versions - run: set +e; clang --version; clang++ --version; ninja --version; wasm-as --version + run: set +e; clang --version; clang++ --version; ninja --version; wat2wasm --version # === PREPARE FOR BUILDING === diff --git a/Meta/generate-libwasm-spec-test.py b/Meta/generate-libwasm-spec-test.py index 0cff818d0b3..476a8db9495 100644 --- a/Meta/generate-libwasm-spec-test.py +++ b/Meta/generate-libwasm-spec-test.py @@ -380,7 +380,7 @@ def main(): with NamedTemporaryFile("w+") as temp: temp.write(mod[1]) temp.flush() - rc = call(["wasm-as", "-n", "-all", temp.name, "-o", outpath]) + rc = call(["wat2wasm", temp.name, "-o", outpath]) if rc != 0: print("Failed to compile", name, "module index", index, "skipping that test", file=stderr) continue