From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 077679CBDCD; Mon, 5 Feb 2024 16:32:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 077679CBDCD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1707139939; bh=uYTM42S8FFfZjf3kzMa9aBi5UdukerZFTcCi60dM3SU=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=D5g0tx5w6VacZteMK+isqUPuUgz5UtLqTb7eebW6kKzQrCZep84EDAcHeTZmMc/KH fm3QDZNxWMIGTce1RkJ04OjDy+QsEt/I3ozpWlYaq9nhGQ11u3Ib9rez2Scy4w2g6x Ao8HFg6zMsgDyR0OGKUMH447idWwB5VVMx24LCL4= Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [95.163.41.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id A59479CBDCD for ; Mon, 5 Feb 2024 16:32:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A59479CBDCD Received: by smtp48.i.mail.ru with esmtpa (envelope-from ) id 1rWz56-00000008WL2-23EE; Mon, 05 Feb 2024 16:32:16 +0300 Message-ID: <10c4a2f2-bfb3-48a2-92cb-d39e66c07788@tarantool.org> Date: Mon, 5 Feb 2024 16:32:16 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD94C460F083DF69F511846634448A0B09D48B4D6D920496B8E182A05F538085040ED06244C53BAF8BEC7A4B249DE6549FDCA84190D92D7FA2092DBA345DE3DAF6CF06A99D732682DD8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE781EBC5BFC74B682DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637BD378188104BC8BE8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C7944F12AA55B1998606D082CBC14EBB5292197EDAD9448ACC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C5E3BF8C76DC23F749735652A29929C6C4AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3FA896608BF009721BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C31BC2FD6A5287AC5335872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A57CEE806CEABF0D775002B1117B3ED6964987C4FE5A51EBA2E772F934B9BCD185823CB91A9FED034534781492E4B8EEAD1E02C13459908652BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFE5D1D0A05A710240484BD1B3D8B6124B531F6E23204C999EEBC4798F5F7ADEA8E547CA128C9EF43814BC176DD269F15E1C2AD41E879CF6FABC6F114E0A517B1713222BD40858412D5F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj0TrRSEWQ3VmgMXGBhCIFFw== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A7697CE7D33F014C4508C7A4B249DE6549FDCA84190D92D7FA20B7CBEF92542CD7C8795FA72BAB74744FC77752E0C033A69EA16A481184E8BB1C9B38E6EA4F046BE03A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 25/26] test: enable LuaJIT test X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey thanks for the patch! LGTM On 1/29/24 13:45, Sergey Kaplun wrote: > This patch moves the test from the to > directory, includes it in , 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 . > > 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