Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>,
	Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit 25/25] test: enable <catch_cpp.lua> LuaJIT test
Date: Fri, 19 Jan 2024 14:32:48 +0300	[thread overview]
Message-ID: <d05b4733cba11743316675f89b675b300827a07a.1705661401.git.skaplun@tarantool.org> (raw)
In-Reply-To: <cover.1705661401.git.skaplun@tarantool.org>

This patch moves the <catch_cpp.lua> test from the <sysdep> to <lang>
directory, includes it in <index>, and names subtests.

Resolves of tarantool/tarantool#7834
Part of tarantool/tarantool#9398
---
 .../{sysdep => lang}/catch_cpp.lua            | 36 ++++++++++---------
 test/LuaJIT-tests/lang/index                  |  1 +
 2 files changed, 20 insertions(+), 17 deletions(-)
 rename test/LuaJIT-tests/{sysdep => lang}/catch_cpp.lua (77%)

diff --git a/test/LuaJIT-tests/sysdep/catch_cpp.lua b/test/LuaJIT-tests/lang/catch_cpp.lua
similarity index 77%
rename from test/LuaJIT-tests/sysdep/catch_cpp.lua
rename to test/LuaJIT-tests/lang/catch_cpp.lua
index b2251009..798b926a 100644
--- a/test/LuaJIT-tests/sysdep/catch_cpp.lua
+++ b/test/LuaJIT-tests/lang/catch_cpp.lua
@@ -1,30 +1,30 @@
-
 local cp = require("cpptest")
 
-do
+local unwind
+
+do --- catch, no error
   local a, b = pcall(cp.catch, function() return "x" end)
   assert(a == true and b == "x")
 end
 
-do
+do --- pcall throw
   local a, b = pcall(function() cp.throw("foo") end)
   assert(a == false and b == "C++ exception")
 end
 
-local unwind
-do
+do --- catch throw
   local a, b = pcall(cp.catch, function() cp.throw("foo") end)
   unwind = a
   assert((a == false and b == "C++ exception") or (a == true and b == "foo"))
 end
 
-do
+do --- alloc, no error
   local st = cp.alloc(function() return cp.isalloc() end)
   assert(st == true)
   assert(cp.isalloc() == false)
 end
 
-do
+do --- throw in alloc
   local a, b = pcall(cp.alloc, function()
     assert(cp.isalloc() == true)
     return "foo", cp.throw
@@ -33,21 +33,23 @@ do
   assert(cp.isalloc() == false)
 end
 
-if unwind then
-  local a, b = pcall(cp.alloc, function()
-    assert(cp.isalloc() == true)
-    return "foo", error
-  end)
-  assert(a == false and b == "foo")
-  assert(cp.isalloc() == false)
+do --- error in alloc
+  if unwind then
+    local a, b = pcall(cp.alloc, function()
+      assert(cp.isalloc() == true)
+      return "foo", error
+    end)
+    assert(a == false and b == "foo")
+    assert(cp.isalloc() == false)
+  end
 end
 
-do
+do --- usereg nop
   local a,b,c,d,e,f = cp.usereg(100, 50, function() end, false)
   assert(a==164 and b==312 and c==428 and d==3696 and e==404 and f==404)
 end
 
-do
+do --- usereg error
   local function test()
     cp.usereg(100, 40, error, "foo")
   end
@@ -55,7 +57,7 @@ do
   assert(a==164 and b==312 and c==428 and d==3696 and e==404 and f==404)
 end
 
-do
+do --- usereg trace with self table lookup
   local t = {};
   t.t = t;
   local function foo()
diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index
index 87b0c5a0..41f7e7db 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_cpp.lua
 catch_wrap.lua
 compare.lua
 compare_nan.lua
-- 
2.43.0


  parent reply	other threads:[~2024-01-19 11:49 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-19 11:32 [Tarantool-patches] [PATCH luajit 00/25] More tests from LuaJIT-tests, part 1 Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 01/25] test: prepare lauxilarily libs for LuaJIT-tests Sergey Kaplun via Tarantool-patches
2024-01-23  9:10   ` Sergey Bronnikov via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 02/25] test: separate LuaJIT helpers from ffi_util.inc Sergey Kaplun via Tarantool-patches
2024-01-23  9:17   ` Sergey Bronnikov via Tarantool-patches
2024-01-23 12:35     ` Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 03/25] test: enable <ffi_arith_ptr.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches
2024-01-23  9:21   ` Sergey Bronnikov via Tarantool-patches
2024-01-23 13:10     ` Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 04/25] test: enable <ffi_bitfield.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 05/25] test: enable <ffi_call.lua> " Sergey Kaplun via Tarantool-patches
2024-01-23  9:32   ` Sergey Bronnikov via Tarantool-patches
2024-01-23 12:46     ` Sergey Kaplun via Tarantool-patches
2024-01-24 11:05       ` Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 06/25] test: enable <ffi_callback.lua> " Sergey Kaplun via Tarantool-patches
2024-01-23  9:36   ` Sergey Bronnikov via Tarantool-patches
2024-01-23 12:01     ` Sergey Bronnikov via Tarantool-patches
2024-01-23 12:58     ` Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 07/25] test: enable <ffi_const.lua> " Sergey Kaplun via Tarantool-patches
2024-01-23  9:38   ` Sergey Bronnikov via Tarantool-patches
2024-01-23 11:59     ` Sergey Bronnikov via Tarantool-patches
2024-01-23 12:52       ` Sergey Kaplun via Tarantool-patches
2024-01-23 12:49     ` Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 08/25] test: enable <ffi_convert.lua> " Sergey Kaplun via Tarantool-patches
2024-01-23  9:39   ` Sergey Bronnikov via Tarantool-patches
2024-01-23 12:51     ` Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 09/25] test: enable <ffi_enum.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 10/25] test: enable <ffi_gcstep_recursive.lua> Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 11/25] test: enable <ffi_jit_arith.lua> in LuaJIT-tests Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 12/25] test: enable <ffi_jit_call.lua> " Sergey Kaplun via Tarantool-patches
2024-01-24 14:43   ` Sergey Bronnikov via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 13/25] test: enable <ffi_jit_conv.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 14/25] test: enable <ffi_lex_number.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 15/25] test: enable <ffi_metatype.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 16/25] test: enable <ffi_new.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 17/25] test: enable <ffi_parse_array.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 18/25] test: enable <ffi_parse_basic.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 19/25] test: enable <ffi_parse_cdef.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 20/25] test: enable <ffi_parse_struct.lua> LuaJIT test Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 21/25] test: enable <ffi_tabov.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 22/25] test: enable <lightud.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 23/25] test: enable <api_call.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` [Tarantool-patches] [PATCH luajit 24/25] test: enable <catch_wrap.lua> " Sergey Kaplun via Tarantool-patches
2024-01-19 11:32 ` Sergey Kaplun via Tarantool-patches [this message]
2024-01-23  9:01 ` [Tarantool-patches] [PATCH luajit 00/25] More tests from LuaJIT-tests, part 1 Sergey Bronnikov 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=d05b4733cba11743316675f89b675b300827a07a.1705661401.git.skaplun@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 luajit 25/25] test: enable <catch_cpp.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