From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org Subject: [Tarantool-patches] [PATCH v2 06/10] test: support tarantool in lua-Harness Date: Tue, 20 Jul 2021 19:26:54 +0300 [thread overview] Message-ID: <3c7f4b9f754b86daaa59bc6663fb8235d4ee7e56.1626797225.git.m.kokryashkin@tarantool.org> (raw) In-Reply-To: <cover.1626797225.git.m.kokryashkin@tarantool.org> Backports 'supoort Tarantool' patch[1] from lua-Harness. [1]: https://framagit.org/fperrad/lua-Harness/-/commit/d3ceee16 Part of tarantool/tarantool#5970 Part of tarantool/tarantool#4473 --- ...standalone.t.disabled => 241-standalone.t} | 5 ++ test/lua-Harness-tests/320-stdin.t | 2 +- .../{411-luajit.t.disabled => 411-luajit.t} | 2 +- test/lua-Harness-tests/profile_tarantool.lua | 63 +++++++++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-) rename test/lua-Harness-tests/{241-standalone.t.disabled => 241-standalone.t} (99%) rename test/lua-Harness-tests/{411-luajit.t.disabled => 411-luajit.t} (99%) create mode 100644 test/lua-Harness-tests/profile_tarantool.lua diff --git a/test/lua-Harness-tests/241-standalone.t.disabled b/test/lua-Harness-tests/241-standalone.t similarity index 99% rename from test/lua-Harness-tests/241-standalone.t.disabled rename to test/lua-Harness-tests/241-standalone.t index 47c50a6b..57d9e5bd 100755 --- a/test/lua-Harness-tests/241-standalone.t.disabled +++ b/test/lua-Harness-tests/241-standalone.t @@ -29,6 +29,11 @@ L<https://www.lua.org/manual/5.4/manual.html#7> --]] require'test_assertion' + +if _TARANTOOL then + skip_all("tarantool") +end + 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/320-stdin.t b/test/lua-Harness-tests/320-stdin.t index bff63760..f4de97fd 100755 --- a/test/lua-Harness-tests/320-stdin.t +++ b/test/lua-Harness-tests/320-stdin.t @@ -64,7 +64,7 @@ end ]] f:close() - local cmd = lua .. [[ -e "f = loadfile(); print(foo); f(); print(foo('ok'))" < foo-320.lua]] + local cmd = lua .. [[ -e "foo = nil; f = loadfile(); print(foo); f(); print(foo('ok'))" < foo-320.lua]] f = io.popen(cmd) equals(f:read'*l', 'nil', "function loadfile (stdin)") equals(f:read'*l', 'ok') diff --git a/test/lua-Harness-tests/411-luajit.t.disabled b/test/lua-Harness-tests/411-luajit.t similarity index 99% rename from test/lua-Harness-tests/411-luajit.t.disabled rename to test/lua-Harness-tests/411-luajit.t index 7830df4f..da1af9ce 100755 --- a/test/lua-Harness-tests/411-luajit.t.disabled +++ b/test/lua-Harness-tests/411-luajit.t @@ -27,7 +27,7 @@ See L<http://luajit.org/running.html> require'test_assertion' local profile = require'profile' -if not jit or ujit then +if not jit or ujit or _TARANTOOL then skip_all("only with LuaJIT") end diff --git a/test/lua-Harness-tests/profile_tarantool.lua b/test/lua-Harness-tests/profile_tarantool.lua new file mode 100644 index 00000000..2abd37ff --- /dev/null +++ b/test/lua-Harness-tests/profile_tarantool.lua @@ -0,0 +1,63 @@ +--- +-- lua-Harness : <https://fperrad.frama.io/lua-Harness/> +--- + +local profile = { + +--[[ compat 5.0 + has_string_gfind = true, + has_math_mod = true, +--]] + + compat51 = false, +--[[ + has_unpack = true, + has_package_loaders = true, + has_math_log10 = true, + has_loadstring = true, + has_table_maxn = true, + has_module = true, + has_package_seeall = true, +--]] + + compat52 = false, +--[[ + has_mathx = true, + has_bit32 = true, + has_metamethod_ipairs = true, +--]] + + compat53 = false, +--[[ + has_math_log10 = true, + has_mathx = true, + has_metamethod_ipairs = true, +--]] + +-- [[ luajit + luajit_compat52 = false, + openresty = false, +--]] + +} + +require'strict'.off() -- allows undeclared variables + +_G.utf8 = nil -- not compatible with the PUC one + +-- luacheck: globals _dofile +function _dofile (filename) + print("# Custom dofile") + return dofile(filename) +end + +package.loaded.profile = profile -- prevents loading of default profile + +return profile + +-- +-- Copyright (c) 2018-2021 Francois Perrad +-- +-- This library is licensed under the terms of the MIT/X11 license, +-- like Lua itself. +-- -- 2.32.0
next prev parent reply other threads:[~2021-07-20 16:30 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-20 16:26 [Tarantool-patches] [PATCH v2 00/10] test: lua-Harness suite patch bump Maxim Kokryashkin via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 01/10] test: port lua-Harness to Test.Assertion Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:08 ` Igor Munkin via Tarantool-patches 2021-07-26 10:38 ` Максим Корякшин via Tarantool-patches 2021-07-27 6:41 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:18 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 02/10] test: rename lua-Harness tap to test_assertion Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:08 ` Igor Munkin via Tarantool-patches 2021-07-27 6:27 ` Sergey Kaplun via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 03/10] test: use CI friendly variables in lua-Harness Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:09 ` Igor Munkin via Tarantool-patches 2021-07-27 9:01 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:23 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 04/10] test: refactor with _retrieve_progname Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:09 ` Igor Munkin via Tarantool-patches 2021-07-27 9:27 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:28 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 05/10] test: refactor with _dofile Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:10 ` Igor Munkin via Tarantool-patches 2021-07-26 12:11 ` Максим Корякшин via Tarantool-patches 2021-07-27 9:34 ` Sergey Kaplun via Tarantool-patches 2021-07-27 22:36 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` Maxim Kokryashkin via Tarantool-patches [this message] 2021-07-25 21:11 ` [Tarantool-patches] [PATCH v2 06/10] test: support tarantool in lua-Harness Igor Munkin via Tarantool-patches 2021-07-26 11:07 ` Максим Корякшин via Tarantool-patches 2021-07-26 19:46 ` Igor Munkin via Tarantool-patches 2021-07-27 10:04 ` Sergey Kaplun via Tarantool-patches 2021-07-28 17:40 ` Максим Корякшин via Tarantool-patches 2021-07-28 17:42 ` Максим Корякшин via Tarantool-patches 2021-07-28 18:34 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:19 ` Максим Корякшин via Tarantool-patches 2021-07-29 9:22 ` Igor Munkin via Tarantool-patches 2021-07-29 10:12 ` Максим Корякшин via Tarantool-patches 2021-07-29 9:47 ` Sergey Kaplun via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 07/10] test: backport lua-Harness directory detection Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:12 ` Igor Munkin via Tarantool-patches 2021-07-26 11:13 ` Максим Корякшин via Tarantool-patches 2021-07-28 18:37 ` Sergey Kaplun via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 08/10] test: support tarantool cli in lua-Harness Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:13 ` Igor Munkin via Tarantool-patches 2021-07-26 11:17 ` Максим Корякшин via Tarantool-patches 2021-07-26 19:53 ` Igor Munkin via Tarantool-patches 2021-07-28 18:44 ` Sergey Kaplun via Tarantool-patches 2021-07-28 18:50 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:23 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 09/10] test: update lua-Harness to b7b1a9a2 Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:14 ` Igor Munkin via Tarantool-patches 2021-07-26 12:21 ` Максим Корякшин via Tarantool-patches 2021-07-26 20:04 ` Igor Munkin via Tarantool-patches 2021-07-28 18:48 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:27 ` Максим Корякшин via Tarantool-patches 2021-07-20 16:26 ` [Tarantool-patches] [PATCH v2 10/10] test: disable test/lua-Harness-tests/241-standalone.t on FreeBSD Maxim Kokryashkin via Tarantool-patches 2021-07-25 21:17 ` Igor Munkin via Tarantool-patches 2021-07-26 12:31 ` Максим Корякшин via Tarantool-patches 2021-07-26 12:32 ` Максим Корякшин via Tarantool-patches 2021-07-26 12:36 ` Максим Корякшин via Tarantool-patches 2021-07-26 20:13 ` Igor Munkin via Tarantool-patches 2021-07-27 6:21 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:41 ` Максим Корякшин via Tarantool-patches 2021-07-29 9:45 ` Sergey Kaplun via Tarantool-patches 2021-07-29 9:57 ` Максим Корякшин via Tarantool-patches 2021-07-30 17:09 ` Igor Munkin via Tarantool-patches 2021-07-25 21:03 ` [Tarantool-patches] [PATCH v2 00/10] test: lua-Harness suite patch bump Igor Munkin via Tarantool-patches 2021-07-30 19:19 ` Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3c7f4b9f754b86daaa59bc6663fb8235d4ee7e56.1626797225.git.m.kokryashkin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 06/10] test: support tarantool in lua-Harness' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox