From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Ostanevich <sergos@tarantool.org>, Igor Munkin <imun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit v3 03/29] test: adapt PUC-Rio suite for out-of-source build Date: Tue, 13 Apr 2021 16:27:03 +0300 [thread overview] Message-ID: <f75d02a084faec4dc09516940152c1109db75804.1618320000.git.skaplun@tarantool.org> (raw) In-Reply-To: <cover.1618320000.git.skaplun@tarantool.org> The redefined `dofile()` function failed to find the test file to load, when tests are run out-of-source. So, fullpath is detected considering `arg[0]` value. Moreover, some tests use `loadfile()` instead, so their argument has to be adjusted to the full path to the files. Usage of functions invoking source test files was changed to `_loadfile()` and `_dofile()` correspondingly. They equal `loadfile()` and `dofile()` by default and can be overloaded via running lua code from LUAJIT_TEST_INIT. This patch introduces the <test/luajit-test-init.lua> file to be executed before tests and redefines the functions considering the path from `arg[0]` variable. Part of tarantool/tarantool#5845 Part of tarantool/tarantool#4473 --- CMakeLists.txt | 4 +-- test/PUC-Rio-Lua-5.1-tests/all.lua | 51 +++++++++++++++++------------- test/luajit-test-init.lua | 18 +++++++++++ 3 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 test/luajit-test-init.lua diff --git a/CMakeLists.txt b/CMakeLists.txt index eb562923..df82d57c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,8 +302,8 @@ set(LUAJIT_TEST_BINARY ${LUAJIT_BINARY} CACHE STRING # tweaked, the introduced option can be used. # XXX: The default behaviour is nop, so /dev/null is the best # option for this. -set(LUAJIT_TEST_INIT "/dev/null" CACHE STRING - "Lua code need to be run before tests are started. Default is nop." +set(LUAJIT_TEST_INIT "${PROJECT_SOURCE_DIR}/test/luajit-test-init.lua" CACHE STRING + "Lua code need to be run before tests are started." ) add_subdirectory(test) diff --git a/test/PUC-Rio-Lua-5.1-tests/all.lua b/test/PUC-Rio-Lua-5.1-tests/all.lua index 8c4aface..7460a677 100755 --- a/test/PUC-Rio-Lua-5.1-tests/all.lua +++ b/test/PUC-Rio-Lua-5.1-tests/all.lua @@ -66,7 +66,12 @@ dofile = function (n) return f() end -dofile('main.lua') +-- LuaJIT: Adapt tests for testing with out-of-source build. +-- See the comment in <test/luajit-test-init.lua>. +local _dofile = _dofile or dofile +local _loadstring = _loadstring or loadstring + +_dofile('main.lua') do local u = newproxy(true) @@ -77,32 +82,34 @@ do end end -local f = assert(loadfile('gc.lua')) +-- LuaJIT: Adapt tests for testing with out-of-source build. +-- See the comment in <test/luajit-test-init.lua>. +local f = assert(_loadfile('gc.lua')) f() -dofile('db.lua') -assert(dofile('calls.lua') == deep and deep) -dofile('strings.lua') -dofile('literals.lua') -assert(dofile('attrib.lua') == 27) -assert(dofile('locals.lua') == 5) -dofile('constructs.lua') -dofile('code.lua') +_dofile('db.lua') +assert(_dofile('calls.lua') == deep and deep) +_dofile('strings.lua') +_dofile('literals.lua') +assert(_dofile('attrib.lua') == 27) +assert(_dofile('locals.lua') == 5) +_dofile('constructs.lua') +_dofile('code.lua') do - local f = coroutine.wrap(assert(loadfile('big.lua'))) + local f = coroutine.wrap(assert(_loadfile('big.lua'))) assert(f() == 'b') assert(f() == 'a') end -dofile('nextvar.lua') -dofile('pm.lua') -dofile('api.lua') -assert(dofile('events.lua') == 12) -dofile('vararg.lua') -dofile('closure.lua') -dofile('errors.lua') -dofile('math.lua') -dofile('sort.lua') -assert(dofile('verybig.lua') == 10); collectgarbage() -dofile('files.lua') +_dofile('nextvar.lua') +_dofile('pm.lua') +_dofile('api.lua') +assert(_dofile('events.lua') == 12) +_dofile('vararg.lua') +_dofile('closure.lua') +_dofile('errors.lua') +_dofile('math.lua') +_dofile('sort.lua') +assert(_dofile('verybig.lua') == 10); collectgarbage() +_dofile('files.lua') if #msgs > 0 then print("\ntests not performed:") diff --git a/test/luajit-test-init.lua b/test/luajit-test-init.lua new file mode 100644 index 00000000..aadd15af --- /dev/null +++ b/test/luajit-test-init.lua @@ -0,0 +1,18 @@ +-- XXX: PUC Rio Lua 5.1 test suite checks that global variable +-- `_loadfile()` exists and use it for code loading from test +-- files If the variable is not defined then suite uses +-- `loadfile()` as default. Same for the `_dofile()`. + +-- XXX: Some tests in PUC Rio Lua 5.1 test suite clean `arg` +-- variable, so evaluate this once and use later. +local path_to_sources = arg[0]:gsub("[^/]+$", "") + +-- luacheck: no global +function _loadfile(filename) + return loadfile(path_to_sources..filename) +end + +-- luacheck: no global +function _dofile(filename) + return dofile(path_to_sources..filename) +end -- 2.31.0
next prev parent reply other threads:[~2021-04-13 13:29 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-13 13:27 [Tarantool-patches] [PATCH luajit v3 00/29] Adapt PUC-Rio Lua 5.1 test suite Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 01/29] test: add " Sergey Kaplun via Tarantool-patches 2021-04-13 20:31 ` Igor Munkin via Tarantool-patches 2021-04-14 13:54 ` Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 02/29] test: build auxiliary C libs from PUC-Rio Lua 5.1 Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` Sergey Kaplun via Tarantool-patches [this message] 2021-04-13 21:05 ` [Tarantool-patches] [PATCH luajit v3 03/29] test: adapt PUC-Rio suite for out-of-source build Igor Munkin via Tarantool-patches 2021-04-14 13:54 ` Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 04/29] test: remove quotes in progname from PUC-Rio Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 05/29] test: adapt PUC-Rio test for arg presence Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 06/29] test: disable PUC-Rio tests confused by -v output Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 07/29] test: disable PUC-Rio tests for bytecode header Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 08/29] test: adapt PUC-Rio tests counting GC steps Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 09/29] test: disable PUC-Rio suite tests for line hook Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 10/29] test: adapt PUC-Rio tests with vararg functions Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 11/29] test: adapt PUC-Rio test for debug in vararg func Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 12/29] test: adapt PUC-Rio test with count hooks Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 13/29] test: disable PUC-Rio test for tail call info Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 14/29] test: adapt PUC-Rio test with activeline check Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 15/29] test: disable PUC-Rio test for per-coroutine hooks Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 16/29] test: adapt PUC-Rio test for %q in string.format Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 17/29] test: disable locale-dependent PUC-Rio tests Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 18/29] test: use math.fmod in " Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 19/29] test: remove string.gfind assert in PUC-Rio test Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 20/29] test: disable PUC-Rio test for getfenv in tailcall Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 21/29] test: disable PUC-Rio test for variables in error Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 22/29] test: disable PUC-Rio test for fast function name Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 23/29] test: disable PUC-Rio test for non-asci identifier Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 24/29] test: disable PUC-Rio test for syntax level error Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 25/29] test: disable PUC-RIO tests for several -l options Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 26/29] test: disable PUC-Rio test for checking arg layout Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 27/29] test: disable PUC-Rio test checking -h option Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 28/29] test: disable PUC-Rio hanging GC test Sergey Kaplun via Tarantool-patches 2021-04-13 13:27 ` [Tarantool-patches] [PATCH luajit v3 29/29] test: disable too deep recursive PUC-Rio test Sergey Kaplun via Tarantool-patches 2021-04-14 21:08 ` [Tarantool-patches] [PATCH luajit v3 00/29] Adapt PUC-Rio Lua 5.1 test suite 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=f75d02a084faec4dc09516940152c1109db75804.1618320000.git.skaplun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=sergos@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v3 03/29] test: adapt PUC-Rio suite for out-of-source build' \ /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