[Tarantool-patches] [PATCH v2 luajit 00/26] More tests from LuaJIT-tests, part 1

Sergey Bronnikov sergeyb at tarantool.org
Tue Feb 20 11:10:05 MSK 2024


Hi, Sergey

thanks for the patch! LGTM

On 2/15/24 15:49, Sergey Kaplun wrote:
> Hi, folks!
>
> I found that with disabled external unwinding, the <catch_cpp.lua> fails
> (predictably). The following patch fixes it (squashed it with the
> corresponding commit).
> ===================================================================
> diff --git a/test/LuaJIT-tests/CMakeLists.txt b/test/LuaJIT-tests/CMakeLists.txt
> index e91e3d4a..a0fb5440 100644
> --- a/test/LuaJIT-tests/CMakeLists.txt
> +++ b/test/LuaJIT-tests/CMakeLists.txt
> @@ -57,12 +57,19 @@ if(LUAJIT_USE_ASAN)
>     endif()
>   endif()
>   
> +if(LUAJIT_NO_UNWIND)
> +  # Test <catch_cpp.lua> verifies the interoperability with C++
> +  # ABI exceptions, so it requires external unwinding enabled.
> +  # Hence, skip them otherwise.
> +  set(LUAJIT_TEST_TAGS_EXTRA +internal_unwinder)
> +endif()
> +
>   add_custom_command(TARGET LuaJIT-tests
>     COMMENT "Running LuaJIT-tests"
>     COMMAND
>       env
>         ${LUAJIT_TESTS_ENV}
>         ${LUAJIT_TEST_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/test.lua
> -      +slow +ffi +bit +jit
> +      +slow +ffi +bit +jit ${LUAJIT_TEST_TAGS_EXTRA}
>     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>   )
> diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index
> index 41f7e7db..4ff7a297 100644
> --- a/test/LuaJIT-tests/lang/index
> +++ b/test/LuaJIT-tests/lang/index
> @@ -1,7 +1,7 @@
>   andor.lua
>   api_call.lua
>   assignment.lua
> -catch_cpp.lua
> +catch_cpp.lua -internal_unwinder
>   catch_wrap.lua
>   compare.lua
>   compare_nan.lua
> ===================================================================
>


More information about the Tarantool-patches mailing list