From 748e7450884129fa6dcaa2cfbf198ba8c181d84a Mon Sep 17 00:00:00 2001 From: Huang Qi Date: Sat, 18 Nov 2023 09:09:30 +0800 Subject: [PATCH] Disable FPU in NuttX spec test (#2781) Fix spec test failure on NuttX with #2780, see: https://github.com/bytecodealliance/wasm-micro-runtime/actions/runs/6910450452 --- .github/workflows/spec_test_on_nuttx.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spec_test_on_nuttx.yml b/.github/workflows/spec_test_on_nuttx.yml index 32efc35da..d7c4246fe 100644 --- a/.github/workflows/spec_test_on_nuttx.yml +++ b/.github/workflows/spec_test_on_nuttx.yml @@ -4,6 +4,12 @@ name: spec test on nuttx on: + pull_request: + types: + - closed + branches: + - main + schedule: - cron: '0 0 * * *' @@ -104,6 +110,11 @@ jobs: find nuttx/boards -name defconfig | xargs sed -i '$a\CONFIG_INTERPRETERS_WAMR=y\nCONFIG_INTERPRETERS_WAMR_STACKSIZE=32768\nCONFIG_INTERPRETERS_WAMR_AOT=y\nCONFIG_INTERPRETERS_WAMR_FAST=y\nCONFIG_INTERPRETERS_WAMR_LOG=y\nCONFIG_INTERPRETERS_WAMR_LIBC_BUILTIN=y\nCONFIG_INTERPRETERS_WAMR_REF_TYPES=y\nCONFIG_INTERPRETERS_WAMR_ENABLE_SPEC_TEST=y\nCONFIG_INTERPRETERS_WAMR_SHARED_MEMORY=y\nCONFIG_INTERPRETERS_WAMR_BULK_MEMORY=y\n' find nuttx/boards -name defconfig | xargs sed -i '$a\CONFIG_EOL_IS_LF=y\nCONFIG_ARM_SEMIHOSTING_HOSTFS=y\nCONFIG_ARM_SEMIHOSTING_HOSTFS_CACHE_COHERENCE=y\nCONFIG_RISCV_SEMIHOSTING_HOSTFS=y\nCONFIG_FS_HOSTFS=y\nCONFIG_LIBC_FLOATINGPOINT=y\n' + - name: Enable additional features for NuttX on RI5C-V + if: startsWith(matrix.nuttx_board_config, 'boards/risc-v') + run: | + find nuttx/boards -name defconfig | xargs sed -i '$a\# CONFIG_ARCH_FPU is not set\n' + - name: Build wamrc working-directory: apps/interpreters/wamr/wamr/wamr-compiler run: | @@ -133,7 +144,7 @@ jobs: tar xvf xpack-qemu-riscv.tar.gz export PATH=$PATH:$PWD/xpack-qemu-riscv-7.1.0-1/bin cd apps/interpreters/wamr/wamr/tests/wamr-test-suites - ./test_wamr.sh -s spec ${{ matrix.wamr_test_option }} -m RISCV32 -b -Q -P -F ${{ env.firmware }} + ./test_wamr.sh -s spec ${{ matrix.wamr_test_option }} -m riscv32 -b -Q -P -F ${{ env.firmware }} - name: Test on RISCV64 if: endsWith(matrix.nuttx_board_config, 'rv-virt/configs/nsh64')