[Tarantool-patches] [PATCH v2 04/10] test: refactor with _retrieve_progname

[Maxim Kokryashkin]

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
---
 .../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/test_assertion.lua      | 18 ++++++++----------
 8 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/test/lua-Harness-tests/241-standalone.t.disabled b/test/lua-Harness-tests/241-standalone.t.disabled
index a02ed5bf..47c50a6b 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 0a2e160e..526b31fe 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 63f0004a..c45b2558 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 5ea3afc7..af2b3232 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 14cbb89a..fbc2d24b 100755
--- a/test/lua-Harness-tests/309-os.t
+++ b/test/lua-Harness-tests/309-os.t
@@ -34,7 +34,7 @@ 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'
 
diff --git a/test/lua-Harness-tests/320-stdin.t b/test/lua-Harness-tests/320-stdin.t
index b65b8f37..bff63760 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'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/411-luajit.t.disabled b/test/lua-Harness-tests/411-luajit.t.disabled
index 39cca5b0..7830df4f 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/test_assertion.lua b/test/lua-Harness-tests/test_assertion.lua
index f50cc319..f126eab1 100644
--- a/test/lua-Harness-tests/test_assertion.lua
+++ b/test/lua-Harness-tests/test_assertion.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.Assertion') then
     diag 'Test.Assertion loaded'
     return
@@ -219,16 +227,6 @@ function todo (reason, count)
     todo_reason = reason
 end
 
--- The least arg element is guaranteed to be the name
--- of the tested binary.
-function get_lua_binary_name ()
-    local i = 0
-    while arg[i] do
-        i = i - 1
-    end
-    return arg[i + 1]
-end
-
 -- XXX: If tests is run out of the tests source tree, the
 -- relative paths below become invalid. Hence, we need to
 -- prepend the directory from the script (i.e. test) name to
-- 
2.32.0