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