Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite
@ 2021-07-05 11:49 Maxim Kokryashkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 1/4] test: resolving program name Maxim Kokryashkin via Tarantool-patches
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-07-05 11:49 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>

As our experience has been considered by the maintainer of lua-Harness
and the issues we faced are finally fixed in mainline repo, we should 
bump lua-Harness suite up to 7040458.

Part of tarantool/tarantool#5970

Maxim Kokryashkin (4):
  test: resolving program name
  test: out-of-source testing
  test: CI-environment
  test: TAP module name collisions

 test/lua-Harness-tests/090-tap.t                     |  2 +-
 test/lua-Harness-tests/091-profile.t                 |  2 +-
 test/lua-Harness-tests/101-boolean.t                 |  4 ++--
 test/lua-Harness-tests/102-function.t                |  4 ++--
 test/lua-Harness-tests/103-nil.t                     |  4 ++--
 test/lua-Harness-tests/104-number.t                  |  4 ++--
 test/lua-Harness-tests/105-string.t                  |  4 ++--
 test/lua-Harness-tests/106-table.t                   |  4 ++--
 test/lua-Harness-tests/107-thread.t                  |  4 ++--
 test/lua-Harness-tests/108-userdata.t                |  4 ++--
 test/lua-Harness-tests/200-examples.t                |  2 +-
 test/lua-Harness-tests/201-assign.t                  |  2 +-
 test/lua-Harness-tests/202-expr.t                    |  2 +-
 test/lua-Harness-tests/203-lexico.t                  | 10 +++++-----
 test/lua-Harness-tests/204-grammar.t                 |  2 +-
 test/lua-Harness-tests/211-scope.t                   |  2 +-
 test/lua-Harness-tests/212-function.t                |  2 +-
 test/lua-Harness-tests/213-closure.t                 |  2 +-
 test/lua-Harness-tests/214-coroutine.t               |  2 +-
 test/lua-Harness-tests/221-table.t                   |  2 +-
 test/lua-Harness-tests/222-constructor.t             |  2 +-
 test/lua-Harness-tests/223-iterator.t                |  2 +-
 test/lua-Harness-tests/231-metatable.t               |  4 ++--
 test/lua-Harness-tests/232-object.t                  |  2 +-
 test/lua-Harness-tests/241-standalone.t.disabled     |  4 ++--
 test/lua-Harness-tests/242-luac.t                    |  4 ++--
 test/lua-Harness-tests/301-basic.t                   |  6 +++---
 test/lua-Harness-tests/303-package.t                 |  6 +++---
 test/lua-Harness-tests/304-string.t                  |  2 +-
 test/lua-Harness-tests/305-utf8.t                    |  4 ++--
 test/lua-Harness-tests/306-table.t                   |  2 +-
 test/lua-Harness-tests/307-math.t                    |  2 +-
 test/lua-Harness-tests/308-io.t                      |  4 ++--
 test/lua-Harness-tests/309-os.t                      |  8 ++++----
 test/lua-Harness-tests/310-debug.t                   |  2 +-
 test/lua-Harness-tests/311-bit32.t                   |  2 +-
 test/lua-Harness-tests/314-regex.t                   |  2 +-
 test/lua-Harness-tests/320-stdin.t                   |  4 ++--
 test/lua-Harness-tests/401-bitop.t                   |  2 +-
 test/lua-Harness-tests/402-ffi.t                     |  2 +-
 test/lua-Harness-tests/403-jit.t                     |  2 +-
 test/lua-Harness-tests/404-ext.t                     |  4 ++--
 test/lua-Harness-tests/411-luajit.t.disabled         |  4 ++--
 test/lua-Harness-tests/CMakeLists.txt                |  5 -----
 .../{tap.lua => test_assertion.lua}                  | 12 ++++++++++++
 45 files changed, 82 insertions(+), 75 deletions(-)
 rename test/lua-Harness-tests/{tap.lua => test_assertion.lua} (95%)

-- 
2.31.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Tarantool-patches] [PATCH 1/4] test: resolving program name
  2021-07-05 11:49 [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
@ 2021-07-05 11:49 ` Maxim Kokryashkin via Tarantool-patches
  2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 2/4] test: out-of-source testing Maxim Kokryashkin via Tarantool-patches
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-07-05 11:49 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>

Part of tarantool/tarantool#5970
---
The patch `fperrad/lua-Harness@1be25a8` from lua-Harness suite is the 
same as the patch `tarantool/luajit@8376885`, except for 
`get_lua_binary_name()`, which was renamed to `_retrieve_progname()` 
in `fperadd/lua-Harness`.

 test/lua-Harness-tests/241-standalone.t.disabled | 2 +-
 test/lua-Harness-tests/242-luac.t                | 2 +-
 test/lua-Harness-tests/301-basic.t               | 2 +-
 test/lua-Harness-tests/308-io.t                  | 2 +-
 test/lua-Harness-tests/309-os.t                  | 2 +-
 test/lua-Harness-tests/320-stdin.t               | 2 +-
 test/lua-Harness-tests/411-luajit.t.disabled     | 2 +-
 test/lua-Harness-tests/tap.lua                   | 8 ++++++++
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/test/lua-Harness-tests/241-standalone.t.disabled b/test/lua-Harness-tests/241-standalone.t.disabled
index c5237eed..b8b6aa60 100755
--- a/test/lua-Harness-tests/241-standalone.t.disabled
+++ b/test/lua-Harness-tests/241-standalone.t.disabled
@@ -41,7 +41,7 @@ elseif ravi then
     banner = '^Ravi %d%.%d%.%d'
 end
 
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 local luac = jit and lua or (lua .. 'c')
 
 if not pcall(io.popen, lua .. [[ -e "a=1"]]) then
diff --git a/test/lua-Harness-tests/242-luac.t b/test/lua-Harness-tests/242-luac.t
index a95a334a..93c990ed 100755
--- a/test/lua-Harness-tests/242-luac.t
+++ b/test/lua-Harness-tests/242-luac.t
@@ -38,7 +38,7 @@ if ravi then
     skip_all("ravi")
 end
 
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 local luac = lua .. 'c'
 
 if not pcall(io.popen, lua .. [[ -e "a=1"]]) then
diff --git a/test/lua-Harness-tests/301-basic.t b/test/lua-Harness-tests/301-basic.t
index a4bb09ff..a4fe6381 100755
--- a/test/lua-Harness-tests/301-basic.t
+++ b/test/lua-Harness-tests/301-basic.t
@@ -48,7 +48,7 @@ local has_warn = _VERSION >= 'Lua 5.4'
 local has_xpcall52 = _VERSION >= 'Lua 5.2' or jit
 local has_xpcall53 = _VERSION >= 'Lua 5.3' or jit
 
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 
 plan'no_plan'
 
diff --git a/test/lua-Harness-tests/308-io.t b/test/lua-Harness-tests/308-io.t
index 35d39c02..dfe2d832 100755
--- a/test/lua-Harness-tests/308-io.t
+++ b/test/lua-Harness-tests/308-io.t
@@ -40,7 +40,7 @@ local has_read53 = _VERSION >= 'Lua 5.3' or luajit21
 local has_meta53 = _VERSION >= 'Lua 5.3'
 local has_meta54 = _VERSION >= 'Lua 5.4'
 
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 
 plan'no_plan'
 
diff --git a/test/lua-Harness-tests/309-os.t b/test/lua-Harness-tests/309-os.t
index a787b147..8258e8af 100755
--- a/test/lua-Harness-tests/309-os.t
+++ b/test/lua-Harness-tests/309-os.t
@@ -34,7 +34,7 @@ require'tap'
 local profile = require'profile'
 local luajit20 = jit and (jit.version_num < 20100 and not jit.version:match'^RaptorJIT')
 local has_execute51 = _VERSION == 'Lua 5.1' and (not profile.luajit_compat52 or ujit)
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 
 plan'no_plan'
 
diff --git a/test/lua-Harness-tests/320-stdin.t b/test/lua-Harness-tests/320-stdin.t
index 4828285d..8b19c5c5 100755
--- a/test/lua-Harness-tests/320-stdin.t
+++ b/test/lua-Harness-tests/320-stdin.t
@@ -26,7 +26,7 @@ Tests Lua Basic & IO Libraries with stdin
 
 require'tap'
 
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 
 if not pcall(io.popen, lua .. [[ -e "a=1"]]) then
     skip_all "io.popen not supported"
diff --git a/test/lua-Harness-tests/411-luajit.t.disabled b/test/lua-Harness-tests/411-luajit.t.disabled
index feb752eb..25c3ee52 100755
--- a/test/lua-Harness-tests/411-luajit.t.disabled
+++ b/test/lua-Harness-tests/411-luajit.t.disabled
@@ -31,7 +31,7 @@ if not jit or ujit then
     skip_all("only with LuaJIT")
 end
 
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
 
 if not pcall(io.popen, lua .. [[ -e "a=1"]]) then
     skip_all("io.popen not supported")
diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/tap.lua
index a8454ae0..86cca4e0 100644
--- a/test/lua-Harness-tests/tap.lua
+++ b/test/lua-Harness-tests/tap.lua
@@ -9,6 +9,14 @@
 
 ]]
 
+function _retrieve_progname ()
+    local i = 0
+    while arg[i] do
+        i = i - 1
+    end
+    return arg[i + 1]
+end
+
 if pcall(require, 'Test.More') then
     diag 'Test.More loaded'
     return
-- 
2.31.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Tarantool-patches] [PATCH 2/4] test: out-of-source testing
  2021-07-05 11:49 [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 1/4] test: resolving program name Maxim Kokryashkin via Tarantool-patches
@ 2021-07-05 11:49 ` Maxim Kokryashkin via Tarantool-patches
  2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 3/4] test: CI-environment Maxim Kokryashkin via Tarantool-patches
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-07-05 11:49 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>

Part of tarantool/tarantool#5970

---
The patch `fperrad/lua-Harness@60da289` is similar to the patch 
`tarantool/luajit@d11c5bb`, but `make_specific_checks()` was 
renamed to `_dofile()` by maintainer. Another difference is that 
it seems like there is no definition for `_dofile()` in mainline 
lua-Harness, so it should be user-defined somewhere. If it is not, 
then `_dofile()` will act like `dofile()`. Considering this, we 
should keep `make_specific_checks` implementation from 
`tarantool/luajit@d11c5bb`, but rename it to `_dofile` and move 
to `tap.lua`.

 test/lua-Harness-tests/101-boolean.t   | 2 +-
 test/lua-Harness-tests/102-function.t  | 2 +-
 test/lua-Harness-tests/103-nil.t       | 2 +-
 test/lua-Harness-tests/104-number.t    | 2 +-
 test/lua-Harness-tests/105-string.t    | 2 +-
 test/lua-Harness-tests/106-table.t     | 2 +-
 test/lua-Harness-tests/107-thread.t    | 2 +-
 test/lua-Harness-tests/108-userdata.t  | 2 +-
 test/lua-Harness-tests/203-lexico.t    | 8 ++++----
 test/lua-Harness-tests/231-metatable.t | 2 +-
 test/lua-Harness-tests/301-basic.t     | 2 +-
 test/lua-Harness-tests/305-utf8.t      | 2 +-
 test/lua-Harness-tests/404-ext.t       | 2 +-
 test/lua-Harness-tests/tap.lua         | 4 ++++
 14 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/test/lua-Harness-tests/101-boolean.t b/test/lua-Harness-tests/101-boolean.t
index c26b276e..b2014436 100755
--- a/test/lua-Harness-tests/101-boolean.t
+++ b/test/lua-Harness-tests/101-boolean.t
@@ -114,7 +114,7 @@ error_like(function () local a = true; a[1] = 1; end,
            "index")
 
 if has_op53 then
-    make_specific_checks'lexico53/boolean.t'
+    _dofile'lexico53/boolean.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/102-function.t b/test/lua-Harness-tests/102-function.t
index c49afc5e..214fcb71 100755
--- a/test/lua-Harness-tests/102-function.t
+++ b/test/lua-Harness-tests/102-function.t
@@ -193,7 +193,7 @@ t[print] = true
 ok(t[print])
 
 if has_op53 then
-    make_specific_checks'lexico53/function.t'
+    _dofile'lexico53/function.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/103-nil.t b/test/lua-Harness-tests/103-nil.t
index 87a1c3b1..55f89d0d 100755
--- a/test/lua-Harness-tests/103-nil.t
+++ b/test/lua-Harness-tests/103-nil.t
@@ -114,7 +114,7 @@ error_like(function () local a = nil; a[1] = 1; end,
            "index")
 
 if has_op53 then
-    make_specific_checks'lexico53/nil.t'
+    _dofile'lexico53/nil.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/104-number.t b/test/lua-Harness-tests/104-number.t
index f5b81e3d..b63f1eb0 100755
--- a/test/lua-Harness-tests/104-number.t
+++ b/test/lua-Harness-tests/104-number.t
@@ -233,7 +233,7 @@ error_like(function () local a = 3.14; a[1] = 1; end,
            "index")
 
 if has_op53 then
-    make_specific_checks'lexico53/number.t'
+    _dofile'lexico53/number.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/105-string.t b/test/lua-Harness-tests/105-string.t
index 184deaba..e24d3818 100755
--- a/test/lua-Harness-tests/105-string.t
+++ b/test/lua-Harness-tests/105-string.t
@@ -264,7 +264,7 @@ error_like(function () a = 'text'; a[1] = 1; end,
            "index")
 
 if has_op53 then
-    make_specific_checks'lexico53/string.t'
+    _dofile'lexico53/string.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/106-table.t b/test/lua-Harness-tests/106-table.t
index 667b9c8d..dac669fe 100755
--- a/test/lua-Harness-tests/106-table.t
+++ b/test/lua-Harness-tests/106-table.t
@@ -122,7 +122,7 @@ error_like(function () t = {}; t[0/0] = 42 end,
            "table index is NaN")
 
 if has_op53 then
-    make_specific_checks'lexico53/table.t'
+    _dofile'lexico53/table.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/107-thread.t b/test/lua-Harness-tests/107-thread.t
index 5c5bf22f..bc105ff1 100755
--- a/test/lua-Harness-tests/107-thread.t
+++ b/test/lua-Harness-tests/107-thread.t
@@ -122,7 +122,7 @@ t[co] = true
 ok(t[co])
 
 if has_op53 then
-    make_specific_checks'lexico53/thread.t'
+    _dofile'lexico53/thread.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/108-userdata.t b/test/lua-Harness-tests/108-userdata.t
index 48a5f60f..8c2918e8 100755
--- a/test/lua-Harness-tests/108-userdata.t
+++ b/test/lua-Harness-tests/108-userdata.t
@@ -119,7 +119,7 @@ t[u] = true
 ok(t[u])
 
 if has_op53 then
-    make_specific_checks'lexico53/userdata.t'
+    _dofile'lexico53/userdata.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/203-lexico.t b/test/lua-Harness-tests/203-lexico.t
index 7f554820..c4a95fa3 100755
--- a/test/lua-Harness-tests/203-lexico.t
+++ b/test/lua-Harness-tests/203-lexico.t
@@ -118,19 +118,19 @@ do
 end
 
 if _VERSION >= 'Lua 5.2' or jit then
-    make_specific_checks'lexico52/lexico.t'
+    _dofile'lexico52/lexico.t'
 end
 
 if _VERSION >= 'Lua 5.3' or luajit21 then
-    make_specific_checks'lexico53/lexico.t'
+    _dofile'lexico53/lexico.t'
 end
 
 if _VERSION >= 'Lua 5.4' then
-    make_specific_checks'lexico54/lexico.t'
+    _dofile'lexico54/lexico.t'
 end
 
 if jit and pcall(require, 'ffi') then
-    make_specific_checks'lexicojit/lexico.t'
+    _dofile'lexicojit/lexico.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/231-metatable.t b/test/lua-Harness-tests/231-metatable.t
index 97ac5420..c0b2344b 100755
--- a/test/lua-Harness-tests/231-metatable.t
+++ b/test/lua-Harness-tests/231-metatable.t
@@ -589,7 +589,7 @@ do
 end
 
 if has_anno_toclose then
-    make_specific_checks'lexico54/metatable.t'
+    _dofile'lexico54/metatable.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/301-basic.t b/test/lua-Harness-tests/301-basic.t
index a4fe6381..2390d694 100755
--- a/test/lua-Harness-tests/301-basic.t
+++ b/test/lua-Harness-tests/301-basic.t
@@ -843,7 +843,7 @@ do -- xpcall
 end
 
 if jit and pcall(require, 'ffi') then
-    make_specific_checks'lexicojit/basic.t'
+    _dofile'lexicojit/basic.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/305-utf8.t b/test/lua-Harness-tests/305-utf8.t
index 6c125388..1e975e6d 100755
--- a/test/lua-Harness-tests/305-utf8.t
+++ b/test/lua-Harness-tests/305-utf8.t
@@ -40,7 +40,7 @@ if not utf8 then
     nok(has_utf8, "no has_utf8")
 else
     plan'no_plan'
-    make_specific_checks'lexico53/utf8.t'
+    _dofile'lexico53/utf8.t'
     if _VERSION >= 'Lua 5.4' then
         make_specific_checks'lexico54/utf8.t'
     end
diff --git a/test/lua-Harness-tests/404-ext.t b/test/lua-Harness-tests/404-ext.t
index a799c750..4938ea3a 100755
--- a/test/lua-Harness-tests/404-ext.t
+++ b/test/lua-Harness-tests/404-ext.t
@@ -158,7 +158,7 @@ end
 
 -- thread.exdata
 if pcall(require, 'ffi') and (profile.openresty or jit.version:match'moonjit') then
-    make_specific_checks'lexicojit/ext.t'
+    _dofile'lexicojit/ext.t'
 end
 
 done_testing()
diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/tap.lua
index 86cca4e0..b17709e5 100644
--- a/test/lua-Harness-tests/tap.lua
+++ b/test/lua-Harness-tests/tap.lua
@@ -9,6 +9,10 @@
 
 ]]
 
+function _dofile (filename)
+    return dofile(arg[0]:gsub('([^/]+)%.t$', '') .. filename)
+end
+
 function _retrieve_progname ()
     local i = 0
     while arg[i] do
-- 
2.31.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Tarantool-patches] [PATCH 3/4] test: CI-environment
  2021-07-05 11:49 [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 1/4] test: resolving program name Maxim Kokryashkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 2/4] test: out-of-source testing Maxim Kokryashkin via Tarantool-patches
@ 2021-07-05 11:49 ` Maxim Kokryashkin via Tarantool-patches
  2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 4/4] test: TAP module name collisions Maxim Kokryashkin via Tarantool-patches
  2021-07-06 20:29 ` [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Igor Munkin via Tarantool-patches
  4 siblings, 1 reply; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-07-05 11:49 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>

Part of tarantool/tarantool#5970
---
The patch `fperrad/lua-Harness@6c2aa87` makes 309-os.t check 
`os.getenv()` function by examining HOME environment variable 
instead of USER, so we don't need to set USERNAME explicitly anymore, 
as it stated in POSIX standard that every user must have HOME 
varibale set. Therefore, `tarantool/luajit@45ed138` should be 
replaced with `fperrad/lua-Harness@6c2aa87`.

 test/lua-Harness-tests/309-os.t       | 4 ++--
 test/lua-Harness-tests/CMakeLists.txt | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/lua-Harness-tests/309-os.t b/test/lua-Harness-tests/309-os.t
index 8258e8af..a55d272a 100755
--- a/test/lua-Harness-tests/309-os.t
+++ b/test/lua-Harness-tests/309-os.t
@@ -169,8 +169,8 @@ end
 do -- getenv
     is(os.getenv('__IMPROBABLE__'), nil, "function getenv")
 
-    local user = os.getenv('LOGNAME') or os.getenv('USERNAME')
-    type_ok(user, 'string', "function getenv")
+    local home = os.getenv('HOME') or os.getenv('HOMEPATH')
+    type_ok(home, 'string', "function getenv")
 end
 
 do -- remove
diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt
index 9fddd625..b9804033 100644
--- a/test/lua-Harness-tests/CMakeLists.txt
+++ b/test/lua-Harness-tests/CMakeLists.txt
@@ -26,11 +26,6 @@ add_custom_command(TARGET lua-Harness-tests
   COMMAND
   env
     LUA_PATH="${LUA_PATH}\;"
-    # XXX: 309-os.t checks os.getenv() function by examining
-    # USERNAME or LOGNAME environment variable.
-    # These variables might not be set in the environment, so
-    # set one of them explicitly.
-    USERNAME="fperrad"
     ${PROVE} ${CMAKE_CURRENT_SOURCE_DIR}
       --exec '${LUAJIT_TEST_COMMAND} -l profile_luajit21'
       ${LUA_TEST_FLAGS}
-- 
2.31.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Tarantool-patches] [PATCH 4/4] test: TAP module name collisions
  2021-07-05 11:49 [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
                   ` (2 preceding siblings ...)
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 3/4] test: CI-environment Maxim Kokryashkin via Tarantool-patches
@ 2021-07-05 11:49 ` Maxim Kokryashkin via Tarantool-patches
  2021-07-06 20:30   ` Igor Munkin via Tarantool-patches
  2021-07-06 20:29 ` [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Igor Munkin via Tarantool-patches
  4 siblings, 1 reply; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-07-05 11:49 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>

Part of tarantool/tarantool#5970
---
The patch `fperrad/lua-Harness@8041c45` renames `tap` module to 
`test_assertion` to avoid name collisions, hence, we can just 
apply this patch.

 test/lua-Harness-tests/090-tap.t                       | 2 +-
 test/lua-Harness-tests/091-profile.t                   | 2 +-
 test/lua-Harness-tests/101-boolean.t                   | 2 +-
 test/lua-Harness-tests/102-function.t                  | 2 +-
 test/lua-Harness-tests/103-nil.t                       | 2 +-
 test/lua-Harness-tests/104-number.t                    | 2 +-
 test/lua-Harness-tests/105-string.t                    | 2 +-
 test/lua-Harness-tests/106-table.t                     | 2 +-
 test/lua-Harness-tests/107-thread.t                    | 2 +-
 test/lua-Harness-tests/108-userdata.t                  | 2 +-
 test/lua-Harness-tests/200-examples.t                  | 2 +-
 test/lua-Harness-tests/201-assign.t                    | 2 +-
 test/lua-Harness-tests/202-expr.t                      | 2 +-
 test/lua-Harness-tests/203-lexico.t                    | 2 +-
 test/lua-Harness-tests/204-grammar.t                   | 2 +-
 test/lua-Harness-tests/211-scope.t                     | 2 +-
 test/lua-Harness-tests/212-function.t                  | 2 +-
 test/lua-Harness-tests/213-closure.t                   | 2 +-
 test/lua-Harness-tests/214-coroutine.t                 | 2 +-
 test/lua-Harness-tests/221-table.t                     | 2 +-
 test/lua-Harness-tests/222-constructor.t               | 2 +-
 test/lua-Harness-tests/223-iterator.t                  | 2 +-
 test/lua-Harness-tests/231-metatable.t                 | 2 +-
 test/lua-Harness-tests/232-object.t                    | 2 +-
 test/lua-Harness-tests/241-standalone.t.disabled       | 2 +-
 test/lua-Harness-tests/242-luac.t                      | 2 +-
 test/lua-Harness-tests/301-basic.t                     | 2 +-
 test/lua-Harness-tests/303-package.t                   | 6 +++---
 test/lua-Harness-tests/304-string.t                    | 2 +-
 test/lua-Harness-tests/305-utf8.t                      | 2 +-
 test/lua-Harness-tests/306-table.t                     | 2 +-
 test/lua-Harness-tests/307-math.t                      | 2 +-
 test/lua-Harness-tests/308-io.t                        | 2 +-
 test/lua-Harness-tests/309-os.t                        | 2 +-
 test/lua-Harness-tests/310-debug.t                     | 2 +-
 test/lua-Harness-tests/311-bit32.t                     | 2 +-
 test/lua-Harness-tests/314-regex.t                     | 2 +-
 test/lua-Harness-tests/320-stdin.t                     | 2 +-
 test/lua-Harness-tests/401-bitop.t                     | 2 +-
 test/lua-Harness-tests/402-ffi.t                       | 2 +-
 test/lua-Harness-tests/403-jit.t                       | 2 +-
 test/lua-Harness-tests/404-ext.t                       | 2 +-
 test/lua-Harness-tests/411-luajit.t.disabled           | 2 +-
 test/lua-Harness-tests/{tap.lua => test_assertion.lua} | 0
 44 files changed, 45 insertions(+), 45 deletions(-)
 rename test/lua-Harness-tests/{tap.lua => test_assertion.lua} (100%)

diff --git a/test/lua-Harness-tests/090-tap.t b/test/lua-Harness-tests/090-tap.t
index 92f04d8e..a3a43de4 100755
--- a/test/lua-Harness-tests/090-tap.t
+++ b/test/lua-Harness-tests/090-tap.t
@@ -22,7 +22,7 @@
 
 ]]
 
-require'tap'
+require'test_assertion'
 
 plan(3)
 ok( true, 'ok' )
diff --git a/test/lua-Harness-tests/091-profile.t b/test/lua-Harness-tests/091-profile.t
index db474384..c6f863f5 100755
--- a/test/lua-Harness-tests/091-profile.t
+++ b/test/lua-Harness-tests/091-profile.t
@@ -22,7 +22,7 @@
 
 ]]
 
-require'tap'
+require'test_assertion'
 
 plan'no_plan'
 
diff --git a/test/lua-Harness-tests/101-boolean.t b/test/lua-Harness-tests/101-boolean.t
index b2014436..e1f47729 100755
--- a/test/lua-Harness-tests/101-boolean.t
+++ b/test/lua-Harness-tests/101-boolean.t
@@ -22,7 +22,7 @@
 
 ]]
 
-require'tap'
+require'test_assertion'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/102-function.t b/test/lua-Harness-tests/102-function.t
index 214fcb71..0e35e73a 100755
--- a/test/lua-Harness-tests/102-function.t
+++ b/test/lua-Harness-tests/102-function.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/103-nil.t b/test/lua-Harness-tests/103-nil.t
index 55f89d0d..52f01b68 100755
--- a/test/lua-Harness-tests/103-nil.t
+++ b/test/lua-Harness-tests/103-nil.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/104-number.t b/test/lua-Harness-tests/104-number.t
index b63f1eb0..8db2d4d1 100755
--- a/test/lua-Harness-tests/104-number.t
+++ b/test/lua-Harness-tests/104-number.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
diff --git a/test/lua-Harness-tests/105-string.t b/test/lua-Harness-tests/105-string.t
index e24d3818..c42c7d54 100755
--- a/test/lua-Harness-tests/105-string.t
+++ b/test/lua-Harness-tests/105-string.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
diff --git a/test/lua-Harness-tests/106-table.t b/test/lua-Harness-tests/106-table.t
index dac669fe..04c79df2 100755
--- a/test/lua-Harness-tests/106-table.t
+++ b/test/lua-Harness-tests/106-table.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/107-thread.t b/test/lua-Harness-tests/107-thread.t
index bc105ff1..c11c6dbf 100755
--- a/test/lua-Harness-tests/107-thread.t
+++ b/test/lua-Harness-tests/107-thread.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/108-userdata.t b/test/lua-Harness-tests/108-userdata.t
index 8c2918e8..288553c8 100755
--- a/test/lua-Harness-tests/108-userdata.t
+++ b/test/lua-Harness-tests/108-userdata.t
@@ -22,7 +22,7 @@
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_op53 = _VERSION >= 'Lua 5.3'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/200-examples.t b/test/lua-Harness-tests/200-examples.t
index 362aae3a..9b57566d 100755
--- a/test/lua-Harness-tests/200-examples.t
+++ b/test/lua-Harness-tests/200-examples.t
@@ -24,7 +24,7 @@ First tests in order to check infrastructure.
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(5)
 
diff --git a/test/lua-Harness-tests/201-assign.t b/test/lua-Harness-tests/201-assign.t
index 7d023d8e..0f5112e1 100755
--- a/test/lua-Harness-tests/201-assign.t
+++ b/test/lua-Harness-tests/201-assign.t
@@ -28,7 +28,7 @@ L<https://www.lua.org/manual/5.4/manual.html#3.3.3>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_env = _VERSION >= 'Lua 5.2'
 
 plan'no_plan'
diff --git a/test/lua-Harness-tests/202-expr.t b/test/lua-Harness-tests/202-expr.t
index 25767507..bd8f6b3d 100755
--- a/test/lua-Harness-tests/202-expr.t
+++ b/test/lua-Harness-tests/202-expr.t
@@ -28,7 +28,7 @@ L<https://www.lua.org/manual/5.4/manual.html#3.4>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local nocvtn2s = profile.nocvtn2s
 local nocvts2n = profile.nocvts2n
diff --git a/test/lua-Harness-tests/203-lexico.t b/test/lua-Harness-tests/203-lexico.t
index c4a95fa3..6333244f 100755
--- a/test/lua-Harness-tests/203-lexico.t
+++ b/test/lua-Harness-tests/203-lexico.t
@@ -31,7 +31,7 @@ L<https://www.lua.org/manual/5.4/manual.html#3.1>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local loadstring = loadstring or load
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
 
diff --git a/test/lua-Harness-tests/204-grammar.t b/test/lua-Harness-tests/204-grammar.t
index d9ae3a6f..363e434d 100755
--- a/test/lua-Harness-tests/204-grammar.t
+++ b/test/lua-Harness-tests/204-grammar.t
@@ -28,7 +28,7 @@ L<https://www.lua.org/manual/5.4/manual.html#9>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local has_goto = _VERSION >= 'Lua 5.2' or jit
 local has_attr = _VERSION >= 'Lua 5.4'
diff --git a/test/lua-Harness-tests/211-scope.t b/test/lua-Harness-tests/211-scope.t
index 64eed521..f46df257 100755
--- a/test/lua-Harness-tests/211-scope.t
+++ b/test/lua-Harness-tests/211-scope.t
@@ -30,7 +30,7 @@ See section "Local Variables and Blocks" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(10)
 
diff --git a/test/lua-Harness-tests/212-function.t b/test/lua-Harness-tests/212-function.t
index 28510537..36a20fb9 100755
--- a/test/lua-Harness-tests/212-function.t
+++ b/test/lua-Harness-tests/212-function.t
@@ -30,7 +30,7 @@ See section "Functions" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 local loadstring = loadstring or load
 
 plan(68)
diff --git a/test/lua-Harness-tests/213-closure.t b/test/lua-Harness-tests/213-closure.t
index fc3bd29c..faa68fa0 100755
--- a/test/lua-Harness-tests/213-closure.t
+++ b/test/lua-Harness-tests/213-closure.t
@@ -24,7 +24,7 @@ See section "Closures" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(15)
 
diff --git a/test/lua-Harness-tests/214-coroutine.t b/test/lua-Harness-tests/214-coroutine.t
index 92929e1b..51da4892 100755
--- a/test/lua-Harness-tests/214-coroutine.t
+++ b/test/lua-Harness-tests/214-coroutine.t
@@ -30,7 +30,7 @@ See section "Coroutines" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
 local has_coroutine52 = _VERSION >= 'Lua 5.2' or jit
diff --git a/test/lua-Harness-tests/221-table.t b/test/lua-Harness-tests/221-table.t
index c064a339..73553fba 100755
--- a/test/lua-Harness-tests/221-table.t
+++ b/test/lua-Harness-tests/221-table.t
@@ -24,7 +24,7 @@ See section "Tables" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(25)
 
diff --git a/test/lua-Harness-tests/222-constructor.t b/test/lua-Harness-tests/222-constructor.t
index a01be2ec..b0ac5994 100755
--- a/test/lua-Harness-tests/222-constructor.t
+++ b/test/lua-Harness-tests/222-constructor.t
@@ -30,7 +30,7 @@ See section "Table Constructors" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(16)
 
diff --git a/test/lua-Harness-tests/223-iterator.t b/test/lua-Harness-tests/223-iterator.t
index 777ad73d..9e8672db 100755
--- a/test/lua-Harness-tests/223-iterator.t
+++ b/test/lua-Harness-tests/223-iterator.t
@@ -25,7 +25,7 @@ section "Coroutines as Iterators" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(8)
 
diff --git a/test/lua-Harness-tests/231-metatable.t b/test/lua-Harness-tests/231-metatable.t
index c0b2344b..994e89c5 100755
--- a/test/lua-Harness-tests/231-metatable.t
+++ b/test/lua-Harness-tests/231-metatable.t
@@ -30,7 +30,7 @@ See section "Metatables and Metamethods" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local has_metamethod52 = _VERSION >= 'Lua 5.2' or profile.luajit_compat52
 local has_metamethod_ipairs = _VERSION == 'Lua 5.2' or profile.compat52 or profile.luajit_compat52
diff --git a/test/lua-Harness-tests/232-object.t b/test/lua-Harness-tests/232-object.t
index 0d875729..651afcb9 100755
--- a/test/lua-Harness-tests/232-object.t
+++ b/test/lua-Harness-tests/232-object.t
@@ -24,7 +24,7 @@ See section "Object-Oriented Programming" in "Programming in Lua".
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 plan(18)
 
diff --git a/test/lua-Harness-tests/241-standalone.t.disabled b/test/lua-Harness-tests/241-standalone.t.disabled
index b8b6aa60..02388659 100755
--- a/test/lua-Harness-tests/241-standalone.t.disabled
+++ b/test/lua-Harness-tests/241-standalone.t.disabled
@@ -28,7 +28,7 @@ L<https://www.lua.org/manual/5.4/manual.html#7>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local has_bytecode = not ujit and not ravi
 local has_error52 = _VERSION >= 'Lua 5.2'
 local has_error53 = _VERSION >= 'Lua 5.3'
diff --git a/test/lua-Harness-tests/242-luac.t b/test/lua-Harness-tests/242-luac.t
index 93c990ed..c4c149f0 100755
--- a/test/lua-Harness-tests/242-luac.t
+++ b/test/lua-Harness-tests/242-luac.t
@@ -28,7 +28,7 @@ L<https://www.lua.org/manual/5.4/manual.html#7>
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 if jit then
     skip_all("LuaJIT")
diff --git a/test/lua-Harness-tests/301-basic.t b/test/lua-Harness-tests/301-basic.t
index 2390d694..cbbc87cc 100755
--- a/test/lua-Harness-tests/301-basic.t
+++ b/test/lua-Harness-tests/301-basic.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.1>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local has_error53 = _VERSION >= 'Lua 5.3'
 local has_gcinfo = _VERSION == 'Lua 5.1'
diff --git a/test/lua-Harness-tests/303-package.t b/test/lua-Harness-tests/303-package.t
index 7e5216d8..232ae87e 100755
--- a/test/lua-Harness-tests/303-package.t
+++ b/test/lua-Harness-tests/303-package.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.3>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
 local has_loaders = _VERSION == 'Lua 5.1'
@@ -130,9 +130,9 @@ end
 
 -- searchpath
 if has_searcherpath then
-    local p = package.searchpath('tap', package.path)
+    local p = package.searchpath('test_assertion', package.path)
     type_ok(p, 'string', "searchpath")
-    p = package.searchpath('tap', 'bad path')
+    p = package.searchpath('test_assertion', 'bad path')
     is(p, nil)
 else
     is(package.searchpath, nil, "no package.searchpath")
diff --git a/test/lua-Harness-tests/304-string.t b/test/lua-Harness-tests/304-string.t
index 991600a7..48af0760 100755
--- a/test/lua-Harness-tests/304-string.t
+++ b/test/lua-Harness-tests/304-string.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.4>
 
 ]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
 local has_dump53 = _VERSION >= 'Lua 5.3' or jit
diff --git a/test/lua-Harness-tests/305-utf8.t b/test/lua-Harness-tests/305-utf8.t
index 1e975e6d..6e9e5cf9 100755
--- a/test/lua-Harness-tests/305-utf8.t
+++ b/test/lua-Harness-tests/305-utf8.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.5>
 
 --]]
 
-require 'tap'
+require 'test_assertion'
 
 local profile = require'profile'
 local has_utf8 = _VERSION >= 'Lua 5.3' or (jit and jit.version:match'moonjit') or profile.utf8
diff --git a/test/lua-Harness-tests/306-table.t b/test/lua-Harness-tests/306-table.t
index 98366556..9c9930bb 100755
--- a/test/lua-Harness-tests/306-table.t
+++ b/test/lua-Harness-tests/306-table.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.6>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
 local has_foreach = _VERSION == 'Lua 5.1'
diff --git a/test/lua-Harness-tests/307-math.t b/test/lua-Harness-tests/307-math.t
index 8b51ed16..0b49703f 100755
--- a/test/lua-Harness-tests/307-math.t
+++ b/test/lua-Harness-tests/307-math.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.7>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local has_integer = _VERSION >= 'Lua 5.3' or (jit and jit.version:match'moonjit') or profile.integer
 local has_mathx = _VERSION < 'Lua 5.3' or profile.compat52 or profile.compat53 or profile.has_mathx
diff --git a/test/lua-Harness-tests/308-io.t b/test/lua-Harness-tests/308-io.t
index dfe2d832..efe31388 100755
--- a/test/lua-Harness-tests/308-io.t
+++ b/test/lua-Harness-tests/308-io.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.8>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
 local has_write51 = _VERSION == 'Lua 5.1' and (not profile.luajit_compat52 or ujit)
diff --git a/test/lua-Harness-tests/309-os.t b/test/lua-Harness-tests/309-os.t
index a55d272a..e7ec6a3b 100755
--- a/test/lua-Harness-tests/309-os.t
+++ b/test/lua-Harness-tests/309-os.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.9>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 local luajit20 = jit and (jit.version_num < 20100 and not jit.version:match'^RaptorJIT')
 local has_execute51 = _VERSION == 'Lua 5.1' and (not profile.luajit_compat52 or ujit)
diff --git a/test/lua-Harness-tests/310-debug.t b/test/lua-Harness-tests/310-debug.t
index f78af03f..6acaf8bd 100755
--- a/test/lua-Harness-tests/310-debug.t
+++ b/test/lua-Harness-tests/310-debug.t
@@ -30,7 +30,7 @@ L<https://www.lua.org/manual/5.4/manual.html#6.10>
 
 ]]
 
-require 'tap'
+require 'test_assertion'
 local profile = require'profile'
 local has_getfenv = _VERSION == 'Lua 5.1'
 local has_gethook54 = _VERSION >= 'Lua 5.4'
diff --git a/test/lua-Harness-tests/311-bit32.t b/test/lua-Harness-tests/311-bit32.t
index 7023906e..bb068b3f 100755
--- a/test/lua-Harness-tests/311-bit32.t
+++ b/test/lua-Harness-tests/311-bit32.t
@@ -29,7 +29,7 @@ L<https://www.lua.org/manual/5.2/manual.html#6.7>
 
 --]]
 
-require 'tap'
+require 'test_assertion'
 local profile = require'profile'
 local has_bit32 = _VERSION == 'Lua 5.2' or profile.compat52 or profile.has_bit32
 
diff --git a/test/lua-Harness-tests/314-regex.t b/test/lua-Harness-tests/314-regex.t
index 58cdb66e..2955e469 100755
--- a/test/lua-Harness-tests/314-regex.t
+++ b/test/lua-Harness-tests/314-regex.t
@@ -49,7 +49,7 @@ Description of the test.
 
 --]]
 
-require'tap'
+require'test_assertion'
 local loadstring = loadstring or load
 
 plan(162)
diff --git a/test/lua-Harness-tests/320-stdin.t b/test/lua-Harness-tests/320-stdin.t
index 8b19c5c5..5302ff7c 100755
--- a/test/lua-Harness-tests/320-stdin.t
+++ b/test/lua-Harness-tests/320-stdin.t
@@ -24,7 +24,7 @@ Tests Lua Basic & IO Libraries with stdin
 
 --]]
 
-require'tap'
+require'test_assertion'
 
 local lua = _retrieve_progname()
 
diff --git a/test/lua-Harness-tests/401-bitop.t b/test/lua-Harness-tests/401-bitop.t
index f95aebf3..11cb9c10 100755
--- a/test/lua-Harness-tests/401-bitop.t
+++ b/test/lua-Harness-tests/401-bitop.t
@@ -24,7 +24,7 @@ See L<http://bitop.luajit.org/>.
 
 --]]
 
-require 'tap'
+require 'test_assertion'
 
 if not jit then
     skip_all("only with LuaJIT")
diff --git a/test/lua-Harness-tests/402-ffi.t b/test/lua-Harness-tests/402-ffi.t
index a2e32a54..8b3e99a0 100755
--- a/test/lua-Harness-tests/402-ffi.t
+++ b/test/lua-Harness-tests/402-ffi.t
@@ -24,7 +24,7 @@ See L<http://luajit.org/ext_ffi.html>.
 
 --]]
 
-require 'tap'
+require 'test_assertion'
 
 if not jit then
     skip_all("only with LuaJIT")
diff --git a/test/lua-Harness-tests/403-jit.t b/test/lua-Harness-tests/403-jit.t
index 0073c90d..93c06c3d 100755
--- a/test/lua-Harness-tests/403-jit.t
+++ b/test/lua-Harness-tests/403-jit.t
@@ -24,7 +24,7 @@ See L<http://luajit.org/ext_jit.html>.
 
 --]]
 
-require 'tap'
+require 'test_assertion'
 local profile = require'profile'
 
 if not jit then
diff --git a/test/lua-Harness-tests/404-ext.t b/test/lua-Harness-tests/404-ext.t
index 4938ea3a..36730cb6 100755
--- a/test/lua-Harness-tests/404-ext.t
+++ b/test/lua-Harness-tests/404-ext.t
@@ -24,7 +24,7 @@ See L<http://luajit.org/ext_jit.html>.
 
 --]]
 
-require 'tap'
+require 'test_assertion'
 local profile = require'profile'
 
 local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT')
diff --git a/test/lua-Harness-tests/411-luajit.t.disabled b/test/lua-Harness-tests/411-luajit.t.disabled
index 25c3ee52..db3dbf5a 100755
--- a/test/lua-Harness-tests/411-luajit.t.disabled
+++ b/test/lua-Harness-tests/411-luajit.t.disabled
@@ -24,7 +24,7 @@ See L<http://luajit.org/running.html>
 
 --]]
 
-require'tap'
+require'test_assertion'
 local profile = require'profile'
 
 if not jit or ujit then
diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/test_assertion.lua
similarity index 100%
rename from test/lua-Harness-tests/tap.lua
rename to test/lua-Harness-tests/test_assertion.lua
-- 
2.31.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite
  2021-07-05 11:49 [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
                   ` (3 preceding siblings ...)
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 4/4] test: TAP module name collisions Maxim Kokryashkin via Tarantool-patches
@ 2021-07-06 20:29 ` Igor Munkin via Tarantool-patches
  4 siblings, 0 replies; 10+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-07-06 20:29 UTC (permalink / raw)
  To: Maxim Kokryashkin; +Cc: tarantool-patches

Max,

Thanks for the series! I see the issue is described not quite clear and
you are misguided a bit, so I decided to describe how I see this
patchset to be done.

  1. As you can see here[1], we borrowed only the part of lua-Harness
  repo at the particular revision. Hence we need to fetch only the
  changes related to test_lua directory (but also consider the changes
  around it).

  2. Right after the commit a74be27 on the master branch, you can find
  commit (ac57a6c), that relates to the sources located outside of the
  desired directory. Just skip it and the other similar changes.

  3. Then you can see commit (074fefa), that changes the default
  assertion machinery used within lua-Harness suite. This patch has to
  be backported.

  4. Here we come to 4 commits made due to my complains to Francois.
  They are already in the series and I left several comments per patch.

  5. Again, another single commit (9455281) with changes in test_lua,
  but which are irrelevant to Tarantool. Anyway, should be backported.

  6. Finally, the patch introducing Tarantool profile for lua-Harness
  (d3ceee1). Furthermore, in scope of this commit CLI tests are disabled
  the right way. Since this is relevant for Tarantool infrastructure,
  this should be backported to our trunk as a separate commit.

  7. The next commit (24a570c) fixes the issue found by our CI, but
  Francois has committed the fix also working on Windows (since
  Microsloth can't use normal slashes...). Also should be backported.

  8. The last commit to be backported separately is the next one
  (1da5b1b). It enables CLI tests disabled earlier in (6). Should be
  backported too.

  9. Everything else on the master branch (HEAD is 673c786 at the moment
  of writing) can be backported within a single commit. Actually, I'm
  for moving the patch in (5) in scope of this commit.


Considering everything above, I see the following history:

| $ git log --oneline
| XXXXXXX test: update lua-Harness to 673c786
| 1da5b1b test: support tarantool cli in lua-Harness
| 24a570c test: backport lua-Harness directory detection
| d3ceee1 test: support tarantool in lua-Harness
| 60da289 test: refactor with _dofile
| 1be25a8 test: refactor with _retrieve_progname
| 6c2aa87 test: use CI friendly variables in lua-Harness
| 8041c45 test: rename lua-Harness tap to test_assertion
| 074fefa test: port lua-Harness to Test.Assertion

As for 'XXXXXXX' patch, it contains of the following:
* 673c7869 https
* 97e9e4c1 check if luac exists
* 4db7e539 fix when no debug
* ac7671b6 follow LuaJIT
* 70404580 refactor with near
* 9455281b follow ravi 1.0-beta4

After everything above is done, we will be synced with Francois' repo
and also will have a nice history of the changes related to our LuaJIT
fork and Tarantool.

On 05.07.21, Maxim Kokryashkin wrote:
> From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>

Please, use this name and email for the commits. Now everything is
authored with the mail you are using to send the patches.

> 
> As our experience has been considered by the maintainer of lua-Harness
> and the issues we faced are finally fixed in mainline repo, we should 
> bump lua-Harness suite up to 7040458.
> 
> Part of tarantool/tarantool#5970

I try to make the mess with tag usage a bit clear to you below:

| $ git log --oneline
| XXXXXXX test: update lua-Harness to 673c786            # Resolves #5970 and Part of #4473
| 1da5b1b test: support tarantool cli in lua-Harness     # Part of #5970 and Part of #4473
| 24a570c test: backport lua-Harness directory detection # Part of #5970 and Part of #4473
| d3ceee1 test: support tarantool in lua-Harness         # Part of #5970 and Part of #4473
| 60da289 test: refactor with _dofile                    # Part of #5970 and Part of #4473
| 1be25a8 test: refactor with _retrieve_progname         # Part of #5970 and Part of #4473
| 6c2aa87 test: use CI friendly variables in lua-Harness # Part of #5970 and Part of #4473
| 8041c45 test: rename lua-Harness tap to test_assertion # Part of #5970 and Part of #4473
| 074fefa test: port lua-Harness to Test.Assertion       # Part of #5970 and Part of #4473

> 
> Maxim Kokryashkin (4):
>   test: resolving program name
>   test: out-of-source testing
>   test: CI-environment
>   test: TAP module name collisions
> 
>  test/lua-Harness-tests/090-tap.t                     |  2 +-
>  test/lua-Harness-tests/091-profile.t                 |  2 +-
>  test/lua-Harness-tests/101-boolean.t                 |  4 ++--
>  test/lua-Harness-tests/102-function.t                |  4 ++--
>  test/lua-Harness-tests/103-nil.t                     |  4 ++--
>  test/lua-Harness-tests/104-number.t                  |  4 ++--
>  test/lua-Harness-tests/105-string.t                  |  4 ++--
>  test/lua-Harness-tests/106-table.t                   |  4 ++--
>  test/lua-Harness-tests/107-thread.t                  |  4 ++--
>  test/lua-Harness-tests/108-userdata.t                |  4 ++--
>  test/lua-Harness-tests/200-examples.t                |  2 +-
>  test/lua-Harness-tests/201-assign.t                  |  2 +-
>  test/lua-Harness-tests/202-expr.t                    |  2 +-
>  test/lua-Harness-tests/203-lexico.t                  | 10 +++++-----
>  test/lua-Harness-tests/204-grammar.t                 |  2 +-
>  test/lua-Harness-tests/211-scope.t                   |  2 +-
>  test/lua-Harness-tests/212-function.t                |  2 +-
>  test/lua-Harness-tests/213-closure.t                 |  2 +-
>  test/lua-Harness-tests/214-coroutine.t               |  2 +-
>  test/lua-Harness-tests/221-table.t                   |  2 +-
>  test/lua-Harness-tests/222-constructor.t             |  2 +-
>  test/lua-Harness-tests/223-iterator.t                |  2 +-
>  test/lua-Harness-tests/231-metatable.t               |  4 ++--
>  test/lua-Harness-tests/232-object.t                  |  2 +-
>  test/lua-Harness-tests/241-standalone.t.disabled     |  4 ++--
>  test/lua-Harness-tests/242-luac.t                    |  4 ++--
>  test/lua-Harness-tests/301-basic.t                   |  6 +++---
>  test/lua-Harness-tests/303-package.t                 |  6 +++---
>  test/lua-Harness-tests/304-string.t                  |  2 +-
>  test/lua-Harness-tests/305-utf8.t                    |  4 ++--
>  test/lua-Harness-tests/306-table.t                   |  2 +-
>  test/lua-Harness-tests/307-math.t                    |  2 +-
>  test/lua-Harness-tests/308-io.t                      |  4 ++--
>  test/lua-Harness-tests/309-os.t                      |  8 ++++----
>  test/lua-Harness-tests/310-debug.t                   |  2 +-
>  test/lua-Harness-tests/311-bit32.t                   |  2 +-
>  test/lua-Harness-tests/314-regex.t                   |  2 +-
>  test/lua-Harness-tests/320-stdin.t                   |  4 ++--
>  test/lua-Harness-tests/401-bitop.t                   |  2 +-
>  test/lua-Harness-tests/402-ffi.t                     |  2 +-
>  test/lua-Harness-tests/403-jit.t                     |  2 +-
>  test/lua-Harness-tests/404-ext.t                     |  4 ++--
>  test/lua-Harness-tests/411-luajit.t.disabled         |  4 ++--
>  test/lua-Harness-tests/CMakeLists.txt                |  5 -----
>  .../{tap.lua => test_assertion.lua}                  | 12 ++++++++++++
>  45 files changed, 82 insertions(+), 75 deletions(-)
>  rename test/lua-Harness-tests/{tap.lua => test_assertion.lua} (95%)
> 
> -- 
> 2.31.1
> 

[1]: https://github.com/tarantool/luajit/commit/347b8bf

-- 
Best regards,
IM

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Tarantool-patches] [PATCH 1/4] test: resolving program name
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 1/4] test: resolving program name Maxim Kokryashkin via Tarantool-patches
@ 2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
  0 siblings, 0 replies; 10+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-07-06 20:29 UTC (permalink / raw)
  To: Maxim Kokryashkin; +Cc: tarantool-patches

Max,

Thanks for the patch! I left several comments below, please consider
them in addition to the main comments in the cover letter.

On 05.07.21, Maxim Kokryashkin wrote:
> From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
> 
> Part of tarantool/tarantool#5970
> ---
> The patch `fperrad/lua-Harness@1be25a8` from lua-Harness suite is the 
> same as the patch `tarantool/luajit@8376885`, except for 

We use the different scheme to mention the particular patch.
* If this is the patch from this repository, then we just use 40-digit
  hash + commit subject enclosed in a single quotes and parenthesis.
  E.g. 837688590919fcf8de47ef90479fd2a640c8fddc ('test: adjust
  lua-Harness suite to CMake machinery').
* If this is the patch from another repository, we just use the full
  link. For the link in plain text (i.e. commit message) we use the next
  policy: <link label>[<index>] + [<index>]: <link> at the end. E.g.
  this commit[1] links to this particular patch pushed to our LuaJIT
  fork (look for the link at the end of the message).

> `get_lua_binary_name()`, which was renamed to `_retrieve_progname()` 
> in `fperadd/lua-Harness`.

It also worth to mention the patch, where <get_lua_binary_name> is
introduced, since the original patch in lua-Harness differs from yours
one. Considering everything written above, I propose the following
rewording for commit message:

| The patch[1] from lua-Harness suite fixes the same issue commit
| 837688590919fcf8de47ef90479fd2a640c8fddc ('test: adjust lua-Harness
| suite to CMake machinery') does except the single difference:
| `get_lua_binary_name()` is called `_retrieved_progname()`. As a result
| of this patch the function is renamed to follow the original naming.
|
| [1]: https://framagit.org/fperrad/lua-Harness/-/commit/1be25a8
|
| Part of tarantool/tarantool#5970
| Part of tarantool/tarantool#4473

If you are OK with the part above, feel free to paste it as is into the
commit message for the next version of the patch.

One more comment: I see Sergey confused you with his review. As it was
mentioned in the previous review, the patch "body" is splitted into two
parts by three dashes ('---').
* The part above is the commit message and it should contain only the
  polished description of the patch (in other words, everything you have
  written before my comment).
* The part below is your blackboard/canvas/etc: you can put there any
  supplementary or auxiliary information, such as branch name (missing
  both here and in the cover letter), link to the issue (also missing),
  test results (also missing).

> 
>  test/lua-Harness-tests/241-standalone.t.disabled | 2 +-
>  test/lua-Harness-tests/242-luac.t                | 2 +-
>  test/lua-Harness-tests/301-basic.t               | 2 +-
>  test/lua-Harness-tests/308-io.t                  | 2 +-
>  test/lua-Harness-tests/309-os.t                  | 2 +-
>  test/lua-Harness-tests/320-stdin.t               | 2 +-
>  test/lua-Harness-tests/411-luajit.t.disabled     | 2 +-
>  test/lua-Harness-tests/tap.lua                   | 8 ++++++++
>  8 files changed, 15 insertions(+), 7 deletions(-)
> 

<snipped>

> diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/tap.lua
> index a8454ae0..86cca4e0 100644
> --- a/test/lua-Harness-tests/tap.lua
> +++ b/test/lua-Harness-tests/tap.lua
> @@ -9,6 +9,14 @@
>  
>  ]]
>  
> +function _retrieve_progname ()
> +    local i = 0
> +    while arg[i] do
> +        i = i - 1
> +    end
> +    return arg[i + 1]
> +end

Please also remove <get_lua_binary_name> within this patch.

> +
>  if pcall(require, 'Test.More') then
>      diag 'Test.More loaded'
>      return
> -- 
> 2.31.1
> 

[1]: https://github.com/tarantool/luajit/commit/d377115

-- 
Best regards,
IM

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Tarantool-patches] [PATCH 2/4] test: out-of-source testing
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 2/4] test: out-of-source testing Maxim Kokryashkin via Tarantool-patches
@ 2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
  0 siblings, 0 replies; 10+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-07-06 20:29 UTC (permalink / raw)
  To: Maxim Kokryashkin; +Cc: tarantool-patches

Max,

Thanks for the patch! I left several comments below, please consider
them in addition to the main comments in the cover letter.

On 05.07.21, Maxim Kokryashkin wrote:
> From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
> 
> Part of tarantool/tarantool#5970
> 
> ---
> The patch `fperrad/lua-Harness@60da289` is similar to the patch 
> `tarantool/luajit@d11c5bb`, but `make_specific_checks()` was 
> renamed to `_dofile()` by maintainer. Another difference is that 
> it seems like there is no definition for `_dofile()` in mainline 
> lua-Harness, so it should be user-defined somewhere. If it is not, 
> then `_dofile()` will act like `dofile()`. Considering this, we 
> should keep `make_specific_checks` implementation from 
> `tarantool/luajit@d11c5bb`, but rename it to `_dofile` and move 
> to `tap.lua`.

In addition to all comments for the first patch, I would like to clarify
the semantics of the change. The general idea was to give the user an
opportunity to *overload* <_dofile> for his own purposes, but the
default behaviour should be the same as <dofile>. We have been already
using this technique for PUC-Rio Lua 5.1 test suite and <_dofile> is
already defined in luajit-test-init.lua (please adjust the comment,
since as a result of the patch, <_dofile> is also used in lua-Harness
suite). Considering all comments, I propose the following rewording:

| The patch[1] from lua-Harness suite is quite similar to commit
| d11c5bbc08a118b11167c5d455d4024607dab662 ('test: adjust lua-Harness
| tests that use dofile'), with the one difference (except the naming):
| `make_specific_checks()` provides the particular behaviour to run the
| tests for out-of-source build, however `_dofile()` allows user to
| overload this function considering his purposes. If user leave
| `_dofile()` untouched, it defaults to `dofile()` Lua standard library
| function.
|
| It's worth to mention, that LuaJIT testing machinery has been using
| such approach since commit 734cc0f1d508429c2c3c46bd1860398db0051060
| ('test: adapt PUC-Rio suite for out-of-source build') and `_dofile()`
| behaviour for running tests when out of source build is used is
| already defined in luajit-test-init.lua.
|
| [1]: https://framagit.org/fperrad/lua-Harness/-/commit/60da289
|
| Part of tarantool/tarantool#5970
| Part of tarantool/tarantool#4473

If you are OK with the part above, feel free to paste it as is into the
commit message for the next version of the patch.

> 
>  test/lua-Harness-tests/101-boolean.t   | 2 +-
>  test/lua-Harness-tests/102-function.t  | 2 +-
>  test/lua-Harness-tests/103-nil.t       | 2 +-
>  test/lua-Harness-tests/104-number.t    | 2 +-
>  test/lua-Harness-tests/105-string.t    | 2 +-
>  test/lua-Harness-tests/106-table.t     | 2 +-
>  test/lua-Harness-tests/107-thread.t    | 2 +-
>  test/lua-Harness-tests/108-userdata.t  | 2 +-
>  test/lua-Harness-tests/203-lexico.t    | 8 ++++----
>  test/lua-Harness-tests/231-metatable.t | 2 +-
>  test/lua-Harness-tests/301-basic.t     | 2 +-
>  test/lua-Harness-tests/305-utf8.t      | 2 +-
>  test/lua-Harness-tests/404-ext.t       | 2 +-
>  test/lua-Harness-tests/tap.lua         | 4 ++++
>  14 files changed, 20 insertions(+), 16 deletions(-)
> 

<snipped>

> diff --git a/test/lua-Harness-tests/305-utf8.t b/test/lua-Harness-tests/305-utf8.t
> index 6c125388..1e975e6d 100755
> --- a/test/lua-Harness-tests/305-utf8.t
> +++ b/test/lua-Harness-tests/305-utf8.t
> @@ -40,7 +40,7 @@ if not utf8 then
>      nok(has_utf8, "no has_utf8")
>  else
>      plan'no_plan'
> -    make_specific_checks'lexico53/utf8.t'
> +    _dofile'lexico53/utf8.t'
>      if _VERSION >= 'Lua 5.4' then
>          make_specific_checks'lexico54/utf8.t'

This one should be also changed to <_dofile>.

>      end

<snipped>

> diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/tap.lua
> index 86cca4e0..b17709e5 100644
> --- a/test/lua-Harness-tests/tap.lua
> +++ b/test/lua-Harness-tests/tap.lua
> @@ -9,6 +9,10 @@
>  
>  ]]
>  
> +function _dofile (filename)
> +    return dofile(arg[0]:gsub('([^/]+)%.t$', '') .. filename)
> +end

At first, <_dofile> should use <dofile> for the default behaviour.
Furthermore, such definition can redefine the function specified by
user, if this function is created after the user-defined one. So, you
need to check whether <_dofile> is defined or use <dofile> if it is not.
BTW, please drop <make_specific_checks> routine from tap.lua, since it's
not used anymore.

> +
>  function _retrieve_progname ()
>      local i = 0
>      while arg[i] do
> -- 
> 2.31.1
> 

-- 
Best regards,
IM

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Tarantool-patches] [PATCH 3/4] test: CI-environment
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 3/4] test: CI-environment Maxim Kokryashkin via Tarantool-patches
@ 2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
  0 siblings, 0 replies; 10+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-07-06 20:29 UTC (permalink / raw)
  To: Maxim Kokryashkin; +Cc: tarantool-patches

Max,

Thanks for the patch! I left several comments regarding the commit
message, please consider them in addition to the main comments in the
cover letter.

On 05.07.21, Maxim Kokryashkin wrote:
> From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
> 
> Part of tarantool/tarantool#5970
> ---
> The patch `fperrad/lua-Harness@6c2aa87` makes 309-os.t check 
> `os.getenv()` function by examining HOME environment variable 
> instead of USER, so we don't need to set USERNAME explicitly anymore, 
> as it stated in POSIX standard that every user must have HOME 
> varibale set. Therefore, `tarantool/luajit@45ed138` should be 
> replaced with `fperrad/lua-Harness@6c2aa87`.

Considering all comments for the first patch, I propose the following
rewording:

| In scope of the commit 45ed138dcb9228d8ac5b8d82331ddd20a0bfada1
| ('test: set USERNAME env var for lua-Harness suite') the environment
| of the testing process is tweaked via CMake, since both LOGNAME and
| USERNAME environment variables might be missing.
|
| Actually, POSIX standard states that every user must have HOME
| environment variable set. It allows to use this in the corresponding
| assertion instead of LOGNAME and USERNAME without additional
| environment setup.
|
| As a result this patch[1] from lua-Harness suite supersedes the
| mentioned commit, and CMake hack can be dropped.
|
| [1]: https://framagit.org/fperrad/lua-Harness/-/commit/6c2aa87
|
| Part of tarantool/tarantool#5970
| Part of tarantool/tarantool#4473

If you are OK with the part above, feel free to paste it as is into the
commit message for the next version of the patch.

> 
>  test/lua-Harness-tests/309-os.t       | 4 ++--
>  test/lua-Harness-tests/CMakeLists.txt | 5 -----
>  2 files changed, 2 insertions(+), 7 deletions(-)

The fix itself is fine and clear, so no comments regarding it.

> 

<snipped>

> -- 
> 2.31.1
> 

-- 
Best regards,
IM

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Tarantool-patches] [PATCH 4/4] test: TAP module name collisions
  2021-07-05 11:49 ` [Tarantool-patches] [PATCH 4/4] test: TAP module name collisions Maxim Kokryashkin via Tarantool-patches
@ 2021-07-06 20:30   ` Igor Munkin via Tarantool-patches
  0 siblings, 0 replies; 10+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-07-06 20:30 UTC (permalink / raw)
  To: Maxim Kokryashkin; +Cc: tarantool-patches

Max,

Thanks for the patch! I left several comments regarding the commit
message, please consider them in addition to the main comments in the
cover letter.

On 05.07.21, Maxim Kokryashkin wrote:
> From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
> 
> Part of tarantool/tarantool#5970
> ---
> The patch `fperrad/lua-Harness@8041c45` renames `tap` module to 
> `test_assertion` to avoid name collisions, hence, we can just 
> apply this patch.

Unfortunately, this is very redundant patch (particularly when Tarantool
profile is finally introduced for lua-Harness), but Francois decided to
rename his module anyway. Considering all comments for the first patch,
I propose the following rewording:

| In scope of this patch[1] from lua-Harness assertion module tap.lua is
| renamed to test_assertion.lua to avoid name collision with Tarantool
| tap builtin module.
|
| [1]: https://framagit.org/fperrad/lua-Harness/-/commit/8041c45
|
| Part of tarantool/tarantool#5970
| Part of tarantool/tarantool#4473

If you are OK with the part above, feel free to paste it as is into the
commit message for the next version of the patch.

> 
>  test/lua-Harness-tests/090-tap.t                       | 2 +-
>  test/lua-Harness-tests/091-profile.t                   | 2 +-
>  test/lua-Harness-tests/101-boolean.t                   | 2 +-
>  test/lua-Harness-tests/102-function.t                  | 2 +-
>  test/lua-Harness-tests/103-nil.t                       | 2 +-
>  test/lua-Harness-tests/104-number.t                    | 2 +-
>  test/lua-Harness-tests/105-string.t                    | 2 +-
>  test/lua-Harness-tests/106-table.t                     | 2 +-
>  test/lua-Harness-tests/107-thread.t                    | 2 +-
>  test/lua-Harness-tests/108-userdata.t                  | 2 +-
>  test/lua-Harness-tests/200-examples.t                  | 2 +-
>  test/lua-Harness-tests/201-assign.t                    | 2 +-
>  test/lua-Harness-tests/202-expr.t                      | 2 +-
>  test/lua-Harness-tests/203-lexico.t                    | 2 +-
>  test/lua-Harness-tests/204-grammar.t                   | 2 +-
>  test/lua-Harness-tests/211-scope.t                     | 2 +-
>  test/lua-Harness-tests/212-function.t                  | 2 +-
>  test/lua-Harness-tests/213-closure.t                   | 2 +-
>  test/lua-Harness-tests/214-coroutine.t                 | 2 +-
>  test/lua-Harness-tests/221-table.t                     | 2 +-
>  test/lua-Harness-tests/222-constructor.t               | 2 +-
>  test/lua-Harness-tests/223-iterator.t                  | 2 +-
>  test/lua-Harness-tests/231-metatable.t                 | 2 +-
>  test/lua-Harness-tests/232-object.t                    | 2 +-
>  test/lua-Harness-tests/241-standalone.t.disabled       | 2 +-
>  test/lua-Harness-tests/242-luac.t                      | 2 +-
>  test/lua-Harness-tests/301-basic.t                     | 2 +-
>  test/lua-Harness-tests/303-package.t                   | 6 +++---
>  test/lua-Harness-tests/304-string.t                    | 2 +-
>  test/lua-Harness-tests/305-utf8.t                      | 2 +-
>  test/lua-Harness-tests/306-table.t                     | 2 +-
>  test/lua-Harness-tests/307-math.t                      | 2 +-
>  test/lua-Harness-tests/308-io.t                        | 2 +-
>  test/lua-Harness-tests/309-os.t                        | 2 +-
>  test/lua-Harness-tests/310-debug.t                     | 2 +-
>  test/lua-Harness-tests/311-bit32.t                     | 2 +-
>  test/lua-Harness-tests/314-regex.t                     | 2 +-
>  test/lua-Harness-tests/320-stdin.t                     | 2 +-
>  test/lua-Harness-tests/401-bitop.t                     | 2 +-
>  test/lua-Harness-tests/402-ffi.t                       | 2 +-
>  test/lua-Harness-tests/403-jit.t                       | 2 +-
>  test/lua-Harness-tests/404-ext.t                       | 2 +-
>  test/lua-Harness-tests/411-luajit.t.disabled           | 2 +-
>  test/lua-Harness-tests/{tap.lua => test_assertion.lua} | 0
>  44 files changed, 45 insertions(+), 45 deletions(-)
>  rename test/lua-Harness-tests/{tap.lua => test_assertion.lua} (100%)

The changes are quite trivial, so no comments regarding them.

> 

<snipped>

> -- 
> 2.31.1
> 

-- 
Best regards,
IM

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-07-06 20:54 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-05 11:49 [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
2021-07-05 11:49 ` [Tarantool-patches] [PATCH 1/4] test: resolving program name Maxim Kokryashkin via Tarantool-patches
2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
2021-07-05 11:49 ` [Tarantool-patches] [PATCH 2/4] test: out-of-source testing Maxim Kokryashkin via Tarantool-patches
2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
2021-07-05 11:49 ` [Tarantool-patches] [PATCH 3/4] test: CI-environment Maxim Kokryashkin via Tarantool-patches
2021-07-06 20:29   ` Igor Munkin via Tarantool-patches
2021-07-05 11:49 ` [Tarantool-patches] [PATCH 4/4] test: TAP module name collisions Maxim Kokryashkin via Tarantool-patches
2021-07-06 20:30   ` Igor Munkin via Tarantool-patches
2021-07-06 20:29 ` [Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite Igor Munkin via Tarantool-patches

Tarantool development patches archive

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lists.tarantool.org/tarantool-patches/0 tarantool-patches/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 tarantool-patches tarantool-patches/ https://lists.tarantool.org/tarantool-patches \
		tarantool-patches@dev.tarantool.org.
	public-inbox-index tarantool-patches

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git