Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Максим Корякшин via Tarantool-patches" <tarantool-patches@dev.tarantool.org>
To: "Sergey Kaplun" <skaplun@tarantool.org>
Cc: "Maxim Kokryashkin" <max.kokryashkin@gmail.com>,
	tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches]  [PATCH v2 06/10] test: support tarantool in lua-Harness
Date: Thu, 29 Jul 2021 12:19:03 +0300
Message-ID: <1627550343.125610573@f728.i.mail.ru> (raw)
In-Reply-To: <YQGjOQsx9H7B8e9s@root>

[-- Attachment #1: Type: text/plain, Size: 5381 bytes --]


Hi! Thanks for the review, Sergey!
Here is the diff, which will add support of OOS build and will adjust
comment in CMakeLists:
============================================================================================
diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt
index b9804033..90b4209a 100644
--- a/test/lua-Harness-tests/CMakeLists.txt
+++ b/test/lua-Harness-tests/CMakeLists.txt
@@ -10,10 +10,10 @@ if(NOT PROVE)
   return()
 endif()
-# Tests create temporary files (see 303-package.t for example)
-# to require. Also, they require some files from original
-# test source directory.
-set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${LUAJIT_SOURCE_DIR}/?.lua")
+# Tests create temporary files (see 303-package.t and 411-luajit.t for
+# example) to require. Also, they require some files from original test
+# source directory.
+set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${LUAJIT_SOURCE_DIR}/?.lua\;${CMAKE_BINARY_DIR}/src/?.lua")
 set(LUA_TEST_FLAGS --failures --shuffle)
 if(CMAKE_VERBOSE_MAKEFILE)
============================================================================================
 
 
> 
>>Hi, Maxim!
>>
>>Thanks for the fixes!
>>
>>My bad, didn't check it before:
>>
>>When building out-of-source build and run tests, 411 test still failed,
>>because LUA_PATH doesn't include path to generated <jit/vmdef.lua>.
>>
>>Please add path to it in the <CMakeLists.txt>.
>>
>>| module 'jit.vmdef' not found:
>>| no field package.preload['jit.vmdef']
>>| no file './jit/vmdef.lua'
>>| no file '/home/burii/reviews/luajit/harness/test/lua-Harness-tests/jit/vmdef.lua'
>>| no file '/home/burii/reviews/luajit/harness/src/jit/vmdef.lua'
>>| no file './jit/vmdef.so'
>>| no file '/usr/local/lib/lua/5.1/jit/vmdef.so'
>>| no file '/usr/local/lib/lua/5.1/loadall.so'
>>| no file './jit.so'
>>| no file '/usr/local/lib/lua/5.1/jit.so'
>>| no file '/usr/local/lib/lua/5.1/loadall.so'
>>
>>On 28.07.21, Максим Корякшин wrote:
>>>
>>> Here is the new commit message:
>>> ==================================================================================
>>
>><snipped>
>>
>>> ==================================================================================
>>>  
>>> And the diff with LUA_PATH adjustments:
>>> ==================================================================================
>>> diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt
>>> index b9804033..bd7f4a9c 100644
>>> --- a/test/lua-Harness-tests/CMakeLists.txt
>>> +++ b/test/lua-Harness-tests/CMakeLists.txt
>>> @@ -13,7 +13,7 @@ endif()
>>>  # Tests create temporary files (see 303-package.t for example)
>>>  # to require. Also, they require some files from original
>>>  # test source directory.
>>
>>Nit: Also you may adjust those comment about required files.
>>
>>> -set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;")
>>> +set(LUA_PATH "./?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${LUAJIT_SOURCE_DIR}/?.lua")
>>>  set(LUA_TEST_FLAGS --failures --shuffle)
>>>  
>>>  if(CMAKE_VERBOSE_MAKEFILE)
>>> ===================================================================================
>>>  
>>>  
>>> --
>>> Максим Корякшин
>>>  
>>>  
>>> >Вторник, 27 июля 2021, 13:05 +03:00 от Sergey Kaplun < skaplun@tarantool.org >:
>>> > 
>>> >Hi, Maxim!
>>> >
>>> >Thanks for the patch!
>>> >
>>> >Please consider my comments below.
>>> >
>>> >On 20.07.21, Maxim Kokryashkin wrote:
>>> >> 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
>>> >> ---
>>> >
>>> >| test: support tarantool in lua-Harness
>>> >
>>> >Nit: s/tarantool/Tarantool/.
>>> >
>>> >|
>>> >| Backports 'support Tarantool' patch[1] from lua-Harness.
>>> >
>>> >Nit: s/Tarantool/tarantool/ regarding to the original commit message.
>>> >
>>> >| This patch introduces lua-Harness profile for Tarantool considering the
>>> >| platform specifics. Furthermore, these changes skip all CLI-related
>>> >| tests for Tarantool binary, so 241-standalone.t and 411-luajit.t can be
>>> >| renamed back.
>>> >
>>> >I afraid, not so fast. Within these changes tests are failed in the
>>> >LuaJIT's repo with the following error:
>>> >|! unknown luaJIT command or jit.* modules not installed
>>> >
>>> >Seems like LUA_PATH should be adjusted for these tests.
>>> >|
>>> >| [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
>>> >
>>> ><snipped>
>>> >
>>> >--
>>> >Best regards,
>>> >Sergey Kaplun
>>>  
>>
>>--
>>Best regards,
>>Sergey Kaplun
> 

[-- Attachment #2: Type: text/html, Size: 6822 bytes --]

  reply	other threads:[~2021-07-29  9:19 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 ` [Tarantool-patches] [PATCH v2 06/10] test: support tarantool in lua-Harness Maxim Kokryashkin via Tarantool-patches
2021-07-25 21:11   ` 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 [this message]
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=1627550343.125610573@f728.i.mail.ru \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=m.kokryashkin@tarantool.org \
    --cc=max.kokryashkin@gmail.com \
    --cc=skaplun@tarantool.org \
    /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

Tarantool development patches archive

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lists.tarantool.org/tarantool-patches/0 tarantool-patches/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 tarantool-patches tarantool-patches/ https://lists.tarantool.org/tarantool-patches \
		tarantool-patches@dev.tarantool.org.
	public-inbox-index tarantool-patches

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git