Skip to content

Commit 9d28a44

Browse files
committed
Fix several issues related to night-run CI and test scripts. (#4385)
- remove duplicated options - fix test script - change ci to use binary
1 parent c4110d3 commit 9d28a44

File tree

2 files changed

+26
-27
lines changed

2 files changed

+26
-27
lines changed

.github/workflows/nightly_run.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ env:
3636
LLVM_EAGER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
3737
MULTI_TIER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
3838
# For Spec Test
39-
# FIXME: use binary release(adding -b) instead of building from source after upgrading to 22.04
40-
DEFAULT_TEST_OPTIONS: "-s spec -P"
41-
MULTI_MODULES_TEST_OPTIONS: "-s spec -M -P"
42-
SIMD_TEST_OPTIONS: "-s spec -S -P"
43-
THREADS_TEST_OPTIONS: "-s spec -p -P"
44-
X86_32_TARGET_TEST_OPTIONS: "-m x86_32 -P"
39+
DEFAULT_TEST_OPTIONS: "-s spec -b -P"
40+
MULTI_MODULES_TEST_OPTIONS: "-s spec -b -P -M"
41+
SIMD_TEST_OPTIONS: "-s spec -b -P -S"
42+
THREADS_TEST_OPTIONS: "-s spec -b -P -p"
43+
X86_32_TARGET_TEST_OPTIONS: "-m x86_32"
4544
WASI_TEST_OPTIONS: "-s wasi_certification -w"
4645

4746
permissions:

tests/wamr-test-suites/test_wamr.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -362,31 +362,31 @@ function sightglass_test()
362362
function setup_wabt()
363363
{
364364
# please sync with .github/actions/install-wasi-sdk-wabt/action.yml
365+
case ${PLATFORM} in
366+
cosmopolitan)
367+
;;
368+
linux)
369+
WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-ubuntu-20.04.tar.gz
370+
WABT_VERSION=1.0.37
371+
;;
372+
darwin)
373+
WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-macos-12.tar.gz
374+
WABT_VERSION=1.0.36
375+
;;
376+
windows)
377+
WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-windows.tar.gz
378+
WABT_VERSION=1.0.37
379+
;;
380+
*)
381+
echo "wabt platform for ${PLATFORM} in unknown"
382+
exit 1
383+
;;
384+
esac
385+
365386
if [ ${WABT_BINARY_RELEASE} == "YES" ]; then
366387
echo "download a binary release and install"
367388
local WAT2WASM=${WORK_DIR}/wabt/out/gcc/Release/wat2wasm
368389
if [ ! -f ${WAT2WASM} ]; then
369-
case ${PLATFORM} in
370-
cosmopolitan)
371-
;;
372-
linux)
373-
WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-ubuntu-20.04.tar.gz
374-
WABT_VERSION=1.0.37
375-
;;
376-
darwin)
377-
WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-macos-12.tar.gz
378-
WABT_VERSION=1.0.36
379-
;;
380-
windows)
381-
WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-windows.tar.gz
382-
WABT_VERSION=1.0.37
383-
;;
384-
*)
385-
echo "wabt platform for ${PLATFORM} in unknown"
386-
exit 1
387-
;;
388-
esac
389-
390390
pushd /tmp
391391
wget -O wabt-tar.gz --progress=dot:giga ${WABT_URL}
392392
tar xf wabt-tar.gz

0 commit comments

Comments
 (0)