From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>,
Maxim Kokryashkin <m.kokryashkin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v2 luajit 25/26] test: enable <catch_wrap.lua> LuaJIT test
Date: Mon, 5 Feb 2024 16:32:16 +0300 [thread overview]
Message-ID: <10c4a2f2-bfb3-48a2-92cb-d39e66c07788@tarantool.org> (raw)
In-Reply-To: <e2aea40dc3534f7be21d734336fceb18fa190a02.1706520765.git.skaplun@tarantool.org>
Hi, Sergey
thanks for the patch! LGTM
On 1/29/24 13:45, Sergey Kaplun wrote:
> This patch moves the <catch_wrap.lua> test from the <misc> to <lang>
> directory, includes it in <index>, and names subtests. Also, since the
> tests may be shuffled, `cp.wrapon()` and `cp.wrapoff()` are used for
> each test separately. Also, this patch adds a workaround for the
> internal ASAN bug, see details in the comment in the <CMakeLists.txt>.
>
> Part of tarantool/tarantool#9398
> ---
> test/LuaJIT-tests/CMakeLists.txt | 16 ++++++++++
> .../{misc => lang}/catch_wrap.lua | 29 +++++++++++++------
> test/LuaJIT-tests/lang/index | 1 +
> 3 files changed, 37 insertions(+), 9 deletions(-)
> rename test/LuaJIT-tests/{misc => lang}/catch_wrap.lua (71%)
>
> diff --git a/test/LuaJIT-tests/CMakeLists.txt b/test/LuaJIT-tests/CMakeLists.txt
> index c52bcc71..8ecfe3f6 100644
> --- a/test/LuaJIT-tests/CMakeLists.txt
> +++ b/test/LuaJIT-tests/CMakeLists.txt
> @@ -24,6 +24,22 @@ else()
> list(APPEND LUAJIT_TESTS_ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}")
> endif()
>
> +if(LUAJIT_USE_ASAN)
> + # When running LuaJIT-tests under ASAN, the internal ASAN check
> + # failed:
> + # AddressSanitizer: CHECK failed: asan_interceptors.cpp:356
> + # "((__interception::real___cxa_throw)) != (0)" (0x0, 0x0)
> + # This is a workaround suggested at
> + # https://github.com/google/sanitizers/issues/934.
> + execute_process(
> + COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libstdc++.so
> + OUTPUT_VARIABLE LIB_STDCPP
> + OUTPUT_STRIP_TRAILING_WHITESPACE
> + )
> + # Fortunately, we are not interested in macOS here.
> + list(APPEND LUAJIT_TESTS_ENV LD_PRELOAD="${LIB_STDCPP}")
> +endif()
> +
> add_custom_command(TARGET LuaJIT-tests
> COMMENT "Running LuaJIT-tests"
> COMMAND
> diff --git a/test/LuaJIT-tests/misc/catch_wrap.lua b/test/LuaJIT-tests/lang/catch_wrap.lua
> similarity index 71%
> rename from test/LuaJIT-tests/misc/catch_wrap.lua
> rename to test/LuaJIT-tests/lang/catch_wrap.lua
> index 7f656bcc..9d1e3478 100644
> --- a/test/LuaJIT-tests/misc/catch_wrap.lua
> +++ b/test/LuaJIT-tests/lang/catch_wrap.lua
> @@ -1,45 +1,56 @@
> +local cp = require("libcpptest")
>
> -local cp = require("cpptest")
> -cp.wrapon()
> +local unwind
>
> -do
> +do --- catch, no error
> + cp.wrapon()
> local a, b = pcall(cp.catch, function() return "x" end)
> assert(a == true and b == "x")
> + cp.wrapoff()
> end
>
> -do
> +do --- pcall throw
> + cp.wrapon()
> local a, b = pcall(function() cp.throw("foo") end)
> assert(a == false and b == "foo")
> + cp.wrapoff()
> end
>
> -local unwind
> -do
> +do --- catch throw
> + cp.wrapon()
> local a, b = pcall(cp.catch, function() cp.throw("foo") end)
> unwind = a
> assert((a == false and b == "foo") or (a == true and b == "catch ..."))
> + cp.wrapoff()
> end
>
> -do
> +do --- alloc, no error
> + cp.wrapon()
> local st = cp.alloc(function() return cp.isalloc() end)
> assert(st == true)
> assert(cp.isalloc() == false)
> + cp.wrapoff()
> end
>
> -do
> +do --- throw in alloc
> + cp.wrapon()
> local a, b = pcall(cp.alloc, function()
> assert(cp.isalloc() == true)
> return "foo", cp.throw
> end)
> assert(a == false and b == "foo")
> assert(cp.isalloc() == false)
> + cp.wrapoff()
> end
>
> -do
> +do --- error in alloc
> + cp.wrapon()
> local a, b = pcall(cp.alloc, function()
> assert(cp.isalloc() == true)
> return "foo", error
> end)
> assert(a == false and b == "foo")
> if unwind then assert(cp.isalloc() == false) end
> + cp.wrapoff()
> end
>
> diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index
> index dc0c2e14..87b0c5a0 100644
> --- a/test/LuaJIT-tests/lang/index
> +++ b/test/LuaJIT-tests/lang/index
> @@ -1,6 +1,7 @@
> andor.lua
> api_call.lua
> assignment.lua
> +catch_wrap.lua
> compare.lua
> compare_nan.lua
> constant
next prev parent reply other threads:[~2024-02-05 13:32 UTC|newest]
Thread overview: 144+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 10:45 [Tarantool-patches] [PATCH v2 luajit 00/26] More tests from LuaJIT-tests, part 1 Sergey Kaplun via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 01/26] cmake: introduce AddTestLib macro Sergey Kaplun via Tarantool-patches
2024-01-31 11:25 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 11:23 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:48 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 14:20 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 02/26] test: prepare lauxilarily libs for LuaJIT-tests Sergey Kaplun via Tarantool-patches
2024-01-31 11:48 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 11:24 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:50 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 14:23 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 03/26] test: separate LuaJIT helpers from ffi_util.inc Sergey Kaplun via Tarantool-patches
2024-01-31 11:58 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 11:47 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:51 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 15:45 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 11:48 ` Sergey Kaplun via Tarantool-patches
2024-02-07 6:49 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 04/26] test: enable <ffi_arith_ptr.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches
2024-01-31 12:21 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 15:50 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 05/26] test: enable <ffi_bitfield.lua> " Sergey Kaplun via Tarantool-patches
2024-01-31 12:26 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 11:54 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:52 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 15:52 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 11:55 ` Sergey Kaplun via Tarantool-patches
2024-02-07 6:50 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 06/26] test: enable <ffi_call.lua> " Sergey Kaplun via Tarantool-patches
2024-01-31 12:34 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 15:58 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 12:01 ` Sergey Kaplun via Tarantool-patches
2024-02-07 6:50 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 07/26] test: enable <ffi_callback.lua> " Sergey Kaplun via Tarantool-patches
2024-01-31 13:02 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 16:01 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 08/26] test: enable <ffi_const.lua> " Sergey Kaplun via Tarantool-patches
2024-01-31 14:32 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 12:09 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:52 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 14:32 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 12:10 ` Sergey Kaplun via Tarantool-patches
2024-02-07 6:52 ` Sergey Bronnikov via Tarantool-patches
2024-02-01 16:02 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 09/26] test: enable <ffi_convert.lua> " Sergey Kaplun via Tarantool-patches
2024-01-31 14:55 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 13:11 ` Sergey Kaplun via Tarantool-patches
2024-02-06 14:03 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:58 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 16:06 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 13:13 ` Sergey Kaplun via Tarantool-patches
2024-02-01 16:19 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 10/26] test: enable <ffi_enum.lua> " Sergey Kaplun via Tarantool-patches
2024-01-31 14:59 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 16:07 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 11/26] test: enable <ffi_gcstep_recursive.lua> Sergey Kaplun via Tarantool-patches
2024-01-31 15:07 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 13:23 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:58 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 16:10 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 12/26] test: enable <ffi_jit_arith.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches
2024-01-31 15:15 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 13:29 ` Sergey Kaplun via Tarantool-patches
2024-02-09 14:59 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 16:12 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 13/26] test: enable <ffi_jit_call.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 8:30 ` Maxim Kokryashkin via Tarantool-patches
2024-02-01 16:15 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 14/26] test: enable <ffi_jit_conv.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 8:32 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 12:51 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 13:33 ` Sergey Kaplun via Tarantool-patches
2024-02-07 6:53 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 15/26] test: enable <ffi_lex_number.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 8:38 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 13:39 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:03 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 12:53 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 16/26] test: enable <ffi_metatype.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 8:40 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 12:58 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 13:48 ` Sergey Kaplun via Tarantool-patches
2024-02-07 7:01 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 17/26] test: enable <ffi_new.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 8:43 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 13:55 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:09 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:03 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 13:58 ` Sergey Kaplun via Tarantool-patches
2024-02-07 7:51 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 18/26] test: enable <ffi_parse_array.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:01 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:11 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:11 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:08 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 14:12 ` Sergey Kaplun via Tarantool-patches
2024-02-07 8:04 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 19/26] test: enable <ffi_parse_basic.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:03 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:15 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:12 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:10 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 20/26] test: enable <ffi_parse_cdef.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:05 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:21 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:12 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:11 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 21/26] test: enable <ffi_parse_struct.lua> LuaJIT test Sergey Kaplun via Tarantool-patches
2024-02-01 9:16 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:23 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:13 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:14 ` Sergey Bronnikov via Tarantool-patches
2024-02-06 14:25 ` Sergey Kaplun via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 22/26] test: enable <ffi_tabov.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:19 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:37 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:13 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:20 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 23/26] test: enable <lightud.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:23 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:43 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:14 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:27 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 24/26] test: enable <api_call.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:25 ` Maxim Kokryashkin via Tarantool-patches
2024-02-06 14:44 ` Sergey Kaplun via Tarantool-patches
2024-02-09 16:15 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:28 ` Sergey Bronnikov via Tarantool-patches
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 25/26] test: enable <catch_wrap.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:31 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:32 ` Sergey Bronnikov via Tarantool-patches [this message]
2024-01-29 10:45 ` [Tarantool-patches] [PATCH v2 luajit 26/26] test: enable <catch_cpp.lua> " Sergey Kaplun via Tarantool-patches
2024-02-01 9:32 ` Maxim Kokryashkin via Tarantool-patches
2024-02-05 13:32 ` Sergey Bronnikov via Tarantool-patches
2024-02-01 16:32 ` [Tarantool-patches] [PATCH v2 luajit 00/26] More tests from LuaJIT-tests, part 1 Sergey Bronnikov via Tarantool-patches
2024-02-06 17:03 ` Sergey Kaplun via Tarantool-patches
2024-02-07 8:06 ` Sergey Bronnikov via Tarantool-patches
2024-02-07 8:14 ` Sergey Bronnikov via Tarantool-patches
2024-02-15 12:49 ` Sergey Kaplun via Tarantool-patches
2024-02-18 11:48 ` Maxim Kokryashkin via Tarantool-patches
2024-02-18 11:54 ` Sergey Kaplun via Tarantool-patches
2024-02-19 8:56 ` Maxim Kokryashkin via Tarantool-patches
2024-02-20 8:10 ` Sergey Bronnikov via Tarantool-patches
2024-02-28 18:25 ` Sergey Kaplun via Tarantool-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10c4a2f2-bfb3-48a2-92cb-d39e66c07788@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=m.kokryashkin@tarantool.org \
--cc=sergeyb@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 luajit 25/26] test: enable <catch_wrap.lua> LuaJIT test' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox