From 421212fe4277b04fb71156a1ada619c95e29b88f Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 10 Mar 2021 18:45:05 +0100 Subject: [PATCH] Add LLVM, move lucet down --- test/default/wasi-test-wrapper.sh | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/test/default/wasi-test-wrapper.sh b/test/default/wasi-test-wrapper.sh index 5abcbad1..8e0c5d7f 100755 --- a/test/default/wasi-test-wrapper.sh +++ b/test/default/wasi-test-wrapper.sh @@ -39,15 +39,11 @@ if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "iwasm" ]; then fi fi -if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "lucet" ]; then - if command -v lucetc-wasi >/dev/null && command -v lucet-wasi >/dev/null; then - lucetc-wasi \ - --target-cpu native \ - --reserved-size "4GiB" \ - --opt-level speed \ - "$1" -o "${1}.so" && - lucet-wasi --dir=.:. --max-heap-size "${MAX_MEMORY_TESTS}" "${1}.so" && - rm -f "${1}.so" && exit 0 +if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "ssvm" ]; then + if command -v ssvmc >/dev/null && command -v ssvm >/dev/null; then + ssvmc "$1" "${1}.so" && + ssvm --dir=.:. "${1}.so" && + rm -f "${1}.so" fi fi @@ -73,5 +69,17 @@ if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "wasmer-js" ]; then fi fi +if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "lucet" ]; then + if command -v lucetc-wasi >/dev/null && command -v lucet-wasi >/dev/null; then + lucetc-wasi \ + --target-cpu native \ + --reserved-size "4GiB" \ + --opt-level speed \ + "$1" -o "${1}.so" && + lucet-wasi --dir=.:. --max-heap-size "${MAX_MEMORY_TESTS}" "${1}.so" && + rm -f "${1}.so" && exit 0 + fi +fi + echo "WebAssembly runtime failed" >&2 exit 1