From 81496a14696780357221e92c80b0b7abb8a3d1dc Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 3 Oct 2020 12:23:15 +0000 Subject: [PATCH] [WASM] Re-enable all stdlib tests on Linux The wasmer cranelift backend is broken since 1.0.0-alpha3, so we use singlepass backend instead until the bug will be resolved. https://github.com/wasmerio/wasmer/issues/1674 --- test/lit.cfg | 2 +- utils/webassembly/ci.sh | 2 +- utils/webassembly/macos/install-dependencies.sh | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test/lit.cfg b/test/lit.cfg index 7a8d849ff4fb3..42cf17fee5372 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -1437,7 +1437,7 @@ elif run_os == 'wasi': config.swift_test_options, config.swift_frontend_test_options]) subst_target_swift_frontend_mock_sdk = config.target_swift_frontend subst_target_swift_frontend_mock_sdk_after = "" - config.target_run = '%s run --backend cranelift --' % config.wasmer + config.target_run = '%s run --singlepass --' % config.wasmer if 'interpret' in lit_config.params: use_interpreter_for_simple_runs() config.target_sil_opt = ( diff --git a/utils/webassembly/ci.sh b/utils/webassembly/ci.sh index 8c9c5c8c80a99..937a7822f927f 100755 --- a/utils/webassembly/ci.sh +++ b/utils/webassembly/ci.sh @@ -40,7 +40,7 @@ if [[ "$(uname)" == "Darwin" ]]; then fi if [[ "$(uname)" == "Linux" ]]; then - $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/ || true + $RUN_TEST_BIN --build-dir $TARGET_BUILD_DIR --target wasi-wasm32 test/stdlib/ echo "Skip running test suites for Linux" else diff --git a/utils/webassembly/macos/install-dependencies.sh b/utils/webassembly/macos/install-dependencies.sh index 59394716e1b5a..d31428694cbbc 100755 --- a/utils/webassembly/macos/install-dependencies.sh +++ b/utils/webassembly/macos/install-dependencies.sh @@ -3,7 +3,13 @@ set -ex brew uninstall $(brew list | grep python@2) -brew install cmake ninja llvm sccache wasmer +brew install cmake ninja llvm sccache + +# Install latest wasmer + +if [ ! -e ~/.wasmer/bin/wasmer ]; then + curl https://get.wasmer.io -sSfL | sh +fi SOURCE_PATH="$( cd "$(dirname $0)/../../../../" && pwd )" SWIFT_PATH=$SOURCE_PATH/swift