* [Tarantool-patches] [PATCH] test: bump lua-Harness suite
@ 2021-07-02 13:31 Maxim Kokryashkin via Tarantool-patches
2021-07-05 7:48 ` Sergey Kaplun via Tarantool-patches
0 siblings, 1 reply; 2+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-07-02 13:31 UTC (permalink / raw)
To: tarantool-patches; +Cc: Maxim Kokryashkin
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.
Changes:
- The patch `fperrad/lua-Harness@1be25a8` from lua-Harness suite is the same as the patch `tarantool/luajit@8376885` from `tarantool/luajit`, except for `get_lua_binary_name()`, which was renamed to `_retrieve_progname()` in `fperadd/lua-Harness`.
- The patch `fperrad/lua-Harness@24a570c` from lua-Harness suite is completely the same as the patch `tarantool/luajit@789820a` from `tarantool/luajit`, so no changes are required.
- 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`.
- 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`.
- The patch `fperrad/lua-Harness@8041c45` renames `tap` module to `test_assertion` to avoid name collisions, hence, we can just apply this patch.
Github branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5970
Closes : #5970
---
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%)
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 c26b276e..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'
@@ -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..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'
@@ -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..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'
@@ -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..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'
@@ -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..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'
@@ -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..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'
@@ -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..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'
@@ -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..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'
@@ -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/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 7f554820..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')
@@ -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/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 97ac5420..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
@@ -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/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 c5237eed..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'
@@ -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..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")
@@ -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..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'
@@ -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'
@@ -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/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 6c125388..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
@@ -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/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 35d39c02..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)
@@ -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..e7ec6a3b 100755
--- a/test/lua-Harness-tests/309-os.t
+++ b/test/lua-Harness-tests/309-os.t
@@ -30,11 +30,11 @@ 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)
-local lua = get_lua_binary_name()
+local lua = _retrieve_progname()
plan'no_plan'
@@ -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/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 4828285d..5302ff7c 100755
--- a/test/lua-Harness-tests/320-stdin.t
+++ b/test/lua-Harness-tests/320-stdin.t
@@ -24,9 +24,9 @@ Tests Lua Basic & IO Libraries with stdin
--]]
-require'tap'
+require'test_assertion'
-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/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 a799c750..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')
@@ -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/411-luajit.t.disabled b/test/lua-Harness-tests/411-luajit.t.disabled
index feb752eb..db3dbf5a 100755
--- a/test/lua-Harness-tests/411-luajit.t.disabled
+++ b/test/lua-Harness-tests/411-luajit.t.disabled
@@ -24,14 +24,14 @@ See L<http://luajit.org/running.html>
--]]
-require'tap'
+require'test_assertion'
local profile = require'profile'
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/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}
diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/test_assertion.lua
similarity index 95%
rename from test/lua-Harness-tests/tap.lua
rename to test/lua-Harness-tests/test_assertion.lua
index a8454ae0..b17709e5 100644
--- a/test/lua-Harness-tests/tap.lua
+++ b/test/lua-Harness-tests/test_assertion.lua
@@ -9,6 +9,18 @@
]]
+function _dofile (filename)
+ return dofile(arg[0]:gsub('([^/]+)%.t$', '') .. filename)
+end
+
+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] 2+ messages in thread
* Re: [Tarantool-patches] [PATCH] test: bump lua-Harness suite
2021-07-02 13:31 [Tarantool-patches] [PATCH] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
@ 2021-07-05 7:48 ` Sergey Kaplun via Tarantool-patches
0 siblings, 0 replies; 2+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2021-07-05 7:48 UTC (permalink / raw)
To: Maxim Kokryashkin; +Cc: tarantool-patches
Hi!
Thanks for the patch!
Side note: please add to "To:" field somebody (usually two persons) you
want to review your changes.
Please separate patchset to the commits of the upstream (with mentioning
cherry-picked commit with full hash to avoid hash clashing -- you can
see examples in the git log). It is easier to review unrelated changes
one by one.
On 02.07.21, Maxim Kokryashkin via Tarantool-patches wrote:
> 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.
We have 72-symbol line width in the commit message body [1], please
reformat it.
>
> Changes:
> - The patch `fperrad/lua-Harness@1be25a8` from lua-Harness suite is the same as the patch `tarantool/luajit@8376885` from `tarantool/luajit`, except for `get_lua_binary_name()`, which was renamed to `_retrieve_progname()` in `fperadd/lua-Harness`.
>
> - The patch `fperrad/lua-Harness@24a570c` from lua-Harness suite is completely the same as the patch `tarantool/luajit@789820a` from `tarantool/luajit`, so no changes are required.
>
> - 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`.
>
> - 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`.
>
> - The patch `fperrad/lua-Harness@8041c45` renames `tap` module to `test_assertion` to avoid name collisions, hence, we can just apply this patch.
>
> Github branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5970
Please provide all patch description between "---" and diff files
mentions [*] (see below), to avoid confusion -- it is not a part
of the commit message.
>
> Closes : #5970
Please use
| Part of tarantool/tarantool#5970
for the first patches and
| Resolves tarantool/tarantool#5970
for the last patch instead (it will be closed after bump LuaJIT version
in the Tarantool).
> ---
<<< [*] Exactly here.
> 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%)
<snipped>
>
[1]: https://github.com/tarantool/tarantool/wiki/Code-review-procedure#commit-message
--
Best regards,
Sergey Kaplun
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-05 7:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 13:31 [Tarantool-patches] [PATCH] test: bump lua-Harness suite Maxim Kokryashkin via Tarantool-patches
2021-07-05 7:48 ` Sergey Kaplun via Tarantool-patches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox