Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Ostanevich <sergos@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v2 luajit 03/30] test: adapt Lua 5.1 suite for out-of-source build
Date: Fri, 26 Mar 2021 17:25:40 +0300	[thread overview]
Message-ID: <YF3u5DWgaXrgO2TU@root> (raw)
In-Reply-To: <E15B4267-FB5B-4BE5-A65E-ED14E621EB1E@tarantool.org>

Hi!

Thanks for the review!

On 26.03.21, Sergey Ostanevich wrote:
> LGTM, just minor changes to commit message.
> 
> Sergos
> 
> 
> > On 26 Mar 2021, at 10:42, Sergey Kaplun <skaplun@tarantool.org> wrote:
> > 
> > When tests are run out-of-source redefined `dofile()` function
>                                   ^ I had problem reading here the 
> ‘out-of-source redefined’. Can you put the ‘when..’ to the appropriate
> place at the end of the sentence? ’The redefined … when … ‘

Fixed.

The new committ message is the following (branch is force-pushed):

===================================================================
test: adapt Lua 5.1 suite for out-of-source build

When tests are run out-of-source redefined `dofile()` function failed to
find the test file to load. So, fullpath is detected considering
`arg[0]` value. Moreover, some tests use `loadfile()` instead, so their
argument is adjusted to the full path to the files.

However, test in <verybig.lua> creates a temporary file
and executes it via `dofile()` too, so this case is handled by
the second argument -- `prefix` equals an empty string for
current working directory.

Part of tarantool/tarantool#5845
Part of tarantool/tarantool#4473
===================================================================

>  
> > failed to find file to load. So, fullpath is detected considering
> > `arg[0]` value. Moreover, some tests use `loadfile()` instead, so
> > their argument is adjusted to the full path to the files.
> > 
> > However, test in <verybig.lua> creates a temporary file
> > and executes it via `dofile()` too, so this case is handled by
> > the second argument -- `prefix` equals an empty string for
> > current working directory.
> > 
> > Part of tarantool/tarantool#5845
> > Part of tarantool/tarantool#4473
> > ---
> > test/PUC-Lua-5.1-tests/all.lua     | 17 +++++++++++++----
> > test/PUC-Lua-5.1-tests/verybig.lua |  4 +++-
> > 2 files changed, 16 insertions(+), 5 deletions(-)
> > 
> > diff --git a/test/PUC-Lua-5.1-tests/all.lua b/test/PUC-Lua-5.1-tests/all.lua
> > index 8c4afac..85beff8 100755
> > --- a/test/PUC-Lua-5.1-tests/all.lua
> > +++ b/test/PUC-Lua-5.1-tests/all.lua
> > @@ -58,9 +58,18 @@ end
> > --
> > -- redefine dofile to run files through dump/undump
> > --
> > -dofile = function (n)
> > +-- LuaJIT: Adapt tests for testing with out-of-source build.
> > +-- XXX: Test in <verybig.lua> creates a temporary file
> > +-- and executes it via `dofile()` too, so this case is handled by
> > +-- the second argument -- `prefix` equals an empty string for
> > +-- current working directory.
> > +-- <all.lua> is in the same directory, where are other common
> > +-- executed files situated.
> > +local path_to_sources = arg[0]:gsub('([^/]+)%.lua$', '')
> > +dofile = function (n, prefix)
> > +  local pr = prefix or path_to_sources
> >   showmem()
> > -  local f = assert(loadfile(n))
> > +  local f = assert(loadfile(pr..n))
> >   local b = string.dump(f)
> >   f = assert(loadstring(b))
> >   return f()
> > @@ -77,7 +86,7 @@ do
> >   end
> > end
> > 
> > -local f = assert(loadfile('gc.lua'))
> > +local f = assert(loadfile(path_to_sources..'gc.lua'))
> > f()
> > dofile('db.lua')
> > assert(dofile('calls.lua') == deep and deep)
> > @@ -88,7 +97,7 @@ 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(path_to_sources..'big.lua')))
> >   assert(f() == 'b')
> >   assert(f() == 'a')
> > end
> > diff --git a/test/PUC-Lua-5.1-tests/verybig.lua b/test/PUC-Lua-5.1-tests/verybig.lua
> > index 59e0142..edb170d 100644
> > --- a/test/PUC-Lua-5.1-tests/verybig.lua
> > +++ b/test/PUC-Lua-5.1-tests/verybig.lua
> > @@ -93,7 +93,9 @@ for s in string.gmatch(prog, "$([^$]+)") do
> >   if not n then io.write(s) else F[n]() end
> > end
> > io.close()
> > -result = dofile(file)
> > +-- LuaJIT: Adapt test for testing with out-of-source build.
> > +-- See comment in <all.lua> near `dofile()` redefinition.
> > +result = dofile(file, "")
> > assert(os.remove(file))
> > print'OK'
> > return result
> > -- 
> > 2.31.0
> > 
> 

-- 
Best regards,
Sergey Kaplun

  reply	other threads:[~2021-03-26 14:26 UTC|newest]

Thread overview: 153+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-26  7:42 [Tarantool-patches] [PATCH v2 luajit 00/30] Adapt PUC-Rio Lua 5.1 test suite Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 01/30] test: add " Sergey Kaplun via Tarantool-patches
2021-03-26 10:14   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:13   ` Igor Munkin via Tarantool-patches
2021-04-01  8:11     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 02/30] test: add compiling for C libs from PUC-Rio-Lua5.1 Sergey Kaplun via Tarantool-patches
2021-03-26 11:01   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:14   ` Igor Munkin via Tarantool-patches
2021-04-01  8:21     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 03/30] test: adapt Lua 5.1 suite for out-of-source build Sergey Kaplun via Tarantool-patches
2021-03-26 11:07   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:25     ` Sergey Kaplun via Tarantool-patches [this message]
2021-03-31 22:58       ` Igor Munkin via Tarantool-patches
2021-04-01  8:43         ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  8:40     ` Sergey Kaplun via Tarantool-patches
2021-04-06 16:56       ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 04/30] test: remove quotes in progname from <main.lua> Sergey Kaplun via Tarantool-patches
2021-03-26 11:12   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  8:50     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 05/30] test: adapt arg availability test from Lua suite Sergey Kaplun via Tarantool-patches
2021-03-26 11:22   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  9:37     ` Sergey Kaplun via Tarantool-patches
2021-04-06 15:24       ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 06/30] test: disable PUC Lua tests confused by -v output Sergey Kaplun via Tarantool-patches
2021-03-26 11:26   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:31     ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  9:56     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 07/30] test: disable Lua tests for bytecode with header Sergey Kaplun via Tarantool-patches
2021-03-26 11:30   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 22:59   ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 08/30] test: disable JIT for GC step counting tests Sergey Kaplun via Tarantool-patches
2021-03-26 11:32   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:14   ` Igor Munkin via Tarantool-patches
2021-04-01 10:10     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 09/30] test: disable Lua suite tests for line hook Sergey Kaplun via Tarantool-patches
2021-03-26 11:35   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:33     ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:59   ` Igor Munkin via Tarantool-patches
2021-04-01 10:06     ` Sergey Kaplun via Tarantool-patches
2021-04-06 19:45       ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 10/30] test: adapt test for debug.setlocal in Lua suite Sergey Kaplun via Tarantool-patches
2021-03-26 11:44   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:45     ` Sergey Kaplun via Tarantool-patches
2021-03-30 22:14   ` Igor Munkin via Tarantool-patches
2021-04-01 10:16     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 11/30] test: adapt getlocal PUC test for vararg func Sergey Kaplun via Tarantool-patches
2021-03-26 11:47   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:52     ` Sergey Kaplun via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:37     ` Sergey Kaplun via Tarantool-patches
2021-04-06 20:09       ` Igor Munkin via Tarantool-patches
2021-04-06 20:40         ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 12/30] test: adapt PUC Lua test with count hooks Sergey Kaplun via Tarantool-patches
2021-03-26 11:49   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:42     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 13/30] test: disable PUC Lua test for tail call info Sergey Kaplun via Tarantool-patches
2021-03-26 14:43   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:52     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 14/30] test: adapt activeline check in the PUC Lua test Sergey Kaplun via Tarantool-patches
2021-03-26 14:50   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:58     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 15/30] test: disable PUC-Lua test for per-coroutine hooks Sergey Kaplun via Tarantool-patches
2021-03-26 14:54   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 12:03     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 16/30] test: adapt PUC Lua test for %q in fmt for LuaJIT Sergey Kaplun via Tarantool-patches
2021-03-26 14:56   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 12:33     ` Sergey Kaplun via Tarantool-patches
2021-04-06 21:37       ` Igor Munkin via Tarantool-patches
2021-04-07 15:50         ` Sergey Kaplun via Tarantool-patches
2021-04-07 16:31           ` Igor Munkin via Tarantool-patches
2021-04-08  8:51             ` Sergey Kaplun via Tarantool-patches
2021-04-12 10:26               ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 17/30] test: disable locale-depended tests for Lua suite Sergey Kaplun via Tarantool-patches
2021-03-26 14:58   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 19:12     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 18/30] test: replace math.mod to math.fmod for Lua tests Sergey Kaplun via Tarantool-patches
2021-03-26 15:12   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:17     ` Igor Munkin via Tarantool-patches
2021-03-26 15:16   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 19:36     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 19/30] test: remove assert for string.gfind check Sergey Kaplun via Tarantool-patches
2021-03-26 15:14   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:17   ` Igor Munkin via Tarantool-patches
2021-04-02  7:05     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 20/30] test: adapt PUC Lua test for args in vararg func Sergey Kaplun via Tarantool-patches
2021-03-26 14:54   ` Sergey Kaplun via Tarantool-patches
2021-03-26 15:22     ` Sergey Ostanevich via Tarantool-patches
2021-03-31  9:51   ` Igor Munkin via Tarantool-patches
2021-04-02  7:21     ` Sergey Kaplun via Tarantool-patches
2021-04-06 20:45       ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 21/30] test: disable test for getfenv in closure tailcall Sergey Kaplun via Tarantool-patches
2021-03-26 15:41   ` Sergey Ostanevich via Tarantool-patches
2021-03-31  9:51   ` Igor Munkin via Tarantool-patches
2021-04-02  7:40     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 22/30] test: disable PUC Lua test for var names in error Sergey Kaplun via Tarantool-patches
2021-03-26 15:44   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 16:01     ` Sergey Kaplun via Tarantool-patches
2021-03-31 19:23   ` Igor Munkin via Tarantool-patches
2021-04-02  7:48     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 23/30] test: disable PUC Lua test for fast function name Sergey Kaplun via Tarantool-patches
2021-03-26 15:45   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:23   ` Igor Munkin via Tarantool-patches
2021-04-02  8:14     ` Sergey Kaplun via Tarantool-patches
2021-04-06 21:37       ` Igor Munkin via Tarantool-patches
2021-04-07 16:06         ` Sergey Kaplun via Tarantool-patches
2021-04-07 16:11           ` Igor Munkin via Tarantool-patches
2021-04-07 19:57             ` Sergey Kaplun via Tarantool-patches
2021-04-12  9:36               ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 24/30] test: disable PUC Lua test for non-asci identifier Sergey Kaplun via Tarantool-patches
2021-03-26 15:46   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:23   ` Igor Munkin via Tarantool-patches
2021-04-02  8:20     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 25/30] test: disable PUC Lua error test for syntax level Sergey Kaplun via Tarantool-patches
2021-03-26 15:52   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:30     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 26/30] test: disable tests with multiple -l options Sergey Kaplun via Tarantool-patches
2021-03-26 15:56   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 27/30] test: disable PUC Lua test for checking arg layout Sergey Kaplun via Tarantool-patches
2021-03-26 15:58   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:35     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 28/30] test: disable PUC Lua test checking -h option Sergey Kaplun via Tarantool-patches
2021-03-26 15:58   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:39     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 29/30] test: disable PUC Lua hanging GC test Sergey Kaplun via Tarantool-patches
2021-03-26 16:03   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24     ` Igor Munkin via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:45     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 30/30] test: disable too depth recursive PUC Lua test Sergey Kaplun via Tarantool-patches
2021-03-26 16:28   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 16:45     ` Sergey Kaplun via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:47     ` Sergey Kaplun via Tarantool-patches
2021-03-26 11:09 ` [Tarantool-patches] [PATCH v2 luajit 00/30] Adapt PUC-Rio Lua 5.1 test suite Sergey Ostanevich via Tarantool-patches
2021-03-26 14:12   ` Sergey Kaplun via Tarantool-patches
2021-03-30 22:17 ` Igor Munkin via Tarantool-patches
2021-03-31  9:41   ` Sergey Kaplun via Tarantool-patches
2021-03-31 10:49     ` 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=YF3u5DWgaXrgO2TU@root \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=sergos@tarantool.org \
    --cc=skaplun@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v2 luajit 03/30] test: adapt Lua 5.1 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