[Tarantool-patches] [PATCH 0/4] test: bump lua-Harness suite
Igor Munkin
imun at tarantool.org
Tue Jul 6 23:29:08 MSK 2021
Max,
Thanks for the series! I see the issue is described not quite clear and
you are misguided a bit, so I decided to describe how I see this
patchset to be done.
1. As you can see here[1], we borrowed only the part of lua-Harness
repo at the particular revision. Hence we need to fetch only the
changes related to test_lua directory (but also consider the changes
around it).
2. Right after the commit a74be27 on the master branch, you can find
commit (ac57a6c), that relates to the sources located outside of the
desired directory. Just skip it and the other similar changes.
3. Then you can see commit (074fefa), that changes the default
assertion machinery used within lua-Harness suite. This patch has to
be backported.
4. Here we come to 4 commits made due to my complains to Francois.
They are already in the series and I left several comments per patch.
5. Again, another single commit (9455281) with changes in test_lua,
but which are irrelevant to Tarantool. Anyway, should be backported.
6. Finally, the patch introducing Tarantool profile for lua-Harness
(d3ceee1). Furthermore, in scope of this commit CLI tests are disabled
the right way. Since this is relevant for Tarantool infrastructure,
this should be backported to our trunk as a separate commit.
7. The next commit (24a570c) fixes the issue found by our CI, but
Francois has committed the fix also working on Windows (since
Microsloth can't use normal slashes...). Also should be backported.
8. The last commit to be backported separately is the next one
(1da5b1b). It enables CLI tests disabled earlier in (6). Should be
backported too.
9. Everything else on the master branch (HEAD is 673c786 at the moment
of writing) can be backported within a single commit. Actually, I'm
for moving the patch in (5) in scope of this commit.
Considering everything above, I see the following history:
| $ git log --oneline
| XXXXXXX test: update lua-Harness to 673c786
| 1da5b1b test: support tarantool cli in lua-Harness
| 24a570c test: backport lua-Harness directory detection
| d3ceee1 test: support tarantool in lua-Harness
| 60da289 test: refactor with _dofile
| 1be25a8 test: refactor with _retrieve_progname
| 6c2aa87 test: use CI friendly variables in lua-Harness
| 8041c45 test: rename lua-Harness tap to test_assertion
| 074fefa test: port lua-Harness to Test.Assertion
As for 'XXXXXXX' patch, it contains of the following:
* 673c7869 https
* 97e9e4c1 check if luac exists
* 4db7e539 fix when no debug
* ac7671b6 follow LuaJIT
* 70404580 refactor with near
* 9455281b follow ravi 1.0-beta4
After everything above is done, we will be synced with Francois' repo
and also will have a nice history of the changes related to our LuaJIT
fork and Tarantool.
On 05.07.21, Maxim Kokryashkin wrote:
> From: Maxim Kokryashkin <m.kokryashkin at tarantool.org>
Please, use this name and email for the commits. Now everything is
authored with the mail you are using to send the patches.
>
> 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.
>
> Part of tarantool/tarantool#5970
I try to make the mess with tag usage a bit clear to you below:
| $ git log --oneline
| XXXXXXX test: update lua-Harness to 673c786 # Resolves #5970 and Part of #4473
| 1da5b1b test: support tarantool cli in lua-Harness # Part of #5970 and Part of #4473
| 24a570c test: backport lua-Harness directory detection # Part of #5970 and Part of #4473
| d3ceee1 test: support tarantool in lua-Harness # Part of #5970 and Part of #4473
| 60da289 test: refactor with _dofile # Part of #5970 and Part of #4473
| 1be25a8 test: refactor with _retrieve_progname # Part of #5970 and Part of #4473
| 6c2aa87 test: use CI friendly variables in lua-Harness # Part of #5970 and Part of #4473
| 8041c45 test: rename lua-Harness tap to test_assertion # Part of #5970 and Part of #4473
| 074fefa test: port lua-Harness to Test.Assertion # Part of #5970 and Part of #4473
>
> Maxim Kokryashkin (4):
> test: resolving program name
> test: out-of-source testing
> test: CI-environment
> test: TAP module name collisions
>
> 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%)
>
> --
> 2.31.1
>
[1]: https://github.com/tarantool/luajit/commit/347b8bf
--
Best regards,
IM
More information about the Tarantool-patches
mailing list