From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id E9D596EC56; Mon, 15 Mar 2021 20:37:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E9D596EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615829860; bh=IvGd3DRpziEDGBJdGGIOXtKEWf9uxtlt9S7aTf0X1u8=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=J0FsAs2/D5QnPeJr+QFu1z2yigp6HaxEZvIq/i2vJ8QkU199HUj2BkyBAB+88vb0i MjaF3Jj5PenyUddwIg1ftbHsxqMtdszF8g5o/7MVkijmI5XdP7CljE1fAXQzuK805d 18Ojq9/vs8/FOzLe0rznxxZVPVJDnh6ZNaTQJQPQ= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id AA91E6EC56 for ; Mon, 15 Mar 2021 20:37:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AA91E6EC56 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lLr9t-0002L7-9z; Mon, 15 Mar 2021 20:37:37 +0300 Date: Mon, 15 Mar 2021 20:37:30 +0300 To: Sergey Kaplun Message-ID: <20210315173730.GE9042@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69B227B6855B2F1ABFAB31FADE3C60B02DF00894C459B0CD1B943B1B950262F0B765F3CA49725ADECD3A43CA940AF9B274AAD9DBB456D7B2605 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DB84ED444C624799EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FAFFEDEAEB71C4328638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C7FF294EE7CC9FD50B0EDCB44AB536471D7028C60023D7E3AA471835C12D1D9774AD6D5ED66289B5259CC434672EE6371117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658359CC434672EE6371117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C2249ADE2ED557203A23075ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4930A3850AC1BE2E73542539A7722CA490CB5C8C57E37DE458B4C7702A67D5C3316FA3894348FB808DB48C21F01D89DB561574AF45C6390F7469DAA53EE0834AAEE X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2BBE337FB72E923155C0AF1600DCBC20BC34632CCC2A66CABB6D898219300CFB1 X-C1DE0DAB: 0D63561A33F958A5EA04DBB20E027F0E1FB2E72742B95117FBF9F89582BE4324D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34B5900AD87B4159A46864D72D9DD585984132356F56BB6C5BAACEEF3DC63820E81349DD6CEDE8B7981D7E09C32AA3244C0A270EDFD4E6F44BEC15B4AFA70A68998580396430872480927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmD8gqPF9k0kDw07Tbsq9Mw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638222496BEFC447563F5AFC37772B4611FB6A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 1/5] test: add lua-Harness test suite X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, Thanks for the patch! On 15.03.21, Sergey Kaplun wrote: > This patch introduces lua-Harness test suite[1] into our LuaJIT > fork source tree. The suite has been taken intact. To check this I used the following recipe: | $ pwd | /lua-Harness/test_lua | $ git remote -v | origin https://framagit.org/fperrad/lua-Harness.git (fetch) | origin https://framagit.org/fperrad/lua-Harness.git (push) | $ git lo -1 | a74be27 (HEAD -> master, origin/master, origin/HEAD) Makefile for lua-5.4.3-rc1 | $ find . -type f | sort | xargs md5sum > ~/vanilla | <...> | $ pwd | /tarantool-luajit/test/lua-Harness-tests | $ git remote -v | origin git@github.com:tarantool/luajit (fetch) | origin git@github.com:tarantool/luajit (push) | $ git lo -1 | aeb693b1 (HEAD) test: add lua-Harness test suite | $ find . -type f | sort | xargs md5sum > ~/tarantool | $ diff ~/vanilla ~/tarantool | 50a51 | > 6b2c7f2b647e0e3f72fd1426520c80a5 ./CMakeLists.txt | 68d68 | < 221b08fe5c896c109f9bf22a65f52c07 ./Makefile > > Considering the different behaviour in the Tarantool runtime, several > tests need to be adjusted. > > [1]: https://framagit.org/fperrad/lua-Harness/tree/a74be27/test_lua > > Part of tarantool/tarantool#5844 > Part of tarantool/tarantool#4473 > --- > > Author: Mergen Imeev > > .luacheckrc | 1 + > test/CMakeLists.txt | 4 +- > test/lua-Harness-tests/000-sanity.t | 54 ++ > test/lua-Harness-tests/001-if.t | 88 ++ > test/lua-Harness-tests/002-table.t | 67 ++ > test/lua-Harness-tests/011-while.t | 89 ++ > test/lua-Harness-tests/012-repeat.t | 85 ++ > test/lua-Harness-tests/014-fornum.t | 151 +++ > test/lua-Harness-tests/015-forlist.t | 111 +++ > test/lua-Harness-tests/090-tap.t | 37 + > test/lua-Harness-tests/091-profile.t | 45 + > test/lua-Harness-tests/101-boolean.t | 127 +++ > test/lua-Harness-tests/102-function.t | 206 +++++ > test/lua-Harness-tests/103-nil.t | 127 +++ > test/lua-Harness-tests/104-number.t | 246 +++++ > test/lua-Harness-tests/105-string.t | 277 ++++++ > test/lua-Harness-tests/106-table.t | 135 +++ > test/lua-Harness-tests/107-thread.t | 135 +++ > test/lua-Harness-tests/108-userdata.t | 132 +++ > test/lua-Harness-tests/200-examples.t | 104 +++ > test/lua-Harness-tests/201-assign.t | 150 +++ > test/lua-Harness-tests/202-expr.t | 157 ++++ > test/lua-Harness-tests/203-lexico.t | 143 +++ > test/lua-Harness-tests/204-grammar.t | 233 +++++ > test/lua-Harness-tests/211-scope.t | 86 ++ > test/lua-Harness-tests/212-function.t | 288 ++++++ > test/lua-Harness-tests/213-closure.t | 98 ++ > test/lua-Harness-tests/214-coroutine.t | 244 +++++ > test/lua-Harness-tests/221-table.t | 120 +++ > test/lua-Harness-tests/222-constructor.t | 119 +++ > test/lua-Harness-tests/223-iterator.t | 203 +++++ > test/lua-Harness-tests/231-metatable.t | 602 ++++++++++++ > test/lua-Harness-tests/232-object.t | 314 +++++++ > test/lua-Harness-tests/241-standalone.t | 269 ++++++ > test/lua-Harness-tests/242-luac.t | 341 +++++++ > test/lua-Harness-tests/301-basic.t | 856 ++++++++++++++++++ > test/lua-Harness-tests/303-package.t | 290 ++++++ > test/lua-Harness-tests/304-string.t | 633 +++++++++++++ > test/lua-Harness-tests/305-utf8.t | 55 ++ > test/lua-Harness-tests/306-table.t | 372 ++++++++ > test/lua-Harness-tests/307-math.t | 375 ++++++++ > test/lua-Harness-tests/308-io.t | 397 ++++++++ > test/lua-Harness-tests/309-os.t | 271 ++++++ > test/lua-Harness-tests/310-debug.t | 322 +++++++ > test/lua-Harness-tests/311-bit32.t | 127 +++ > test/lua-Harness-tests/314-regex.t | 222 +++++ > test/lua-Harness-tests/320-stdin.t | 133 +++ > test/lua-Harness-tests/401-bitop.t | 106 +++ > test/lua-Harness-tests/402-ffi.t | 142 +++ > test/lua-Harness-tests/403-jit.t | 163 ++++ > test/lua-Harness-tests/404-ext.t | 171 ++++ > test/lua-Harness-tests/411-luajit.t | 211 +++++ > test/lua-Harness-tests/CMakeLists.txt | 49 + > test/lua-Harness-tests/lexico52/lexico.t | 45 + > test/lua-Harness-tests/lexico53/boolean.t | 43 + > test/lua-Harness-tests/lexico53/function.t | 66 ++ > test/lua-Harness-tests/lexico53/lexico.t | 30 + > test/lua-Harness-tests/lexico53/nil.t | 43 + > test/lua-Harness-tests/lexico53/number.t | 181 ++++ > test/lua-Harness-tests/lexico53/string.t | 169 ++++ > test/lua-Harness-tests/lexico53/table.t | 43 + > test/lua-Harness-tests/lexico53/thread.t | 45 + > test/lua-Harness-tests/lexico53/userdata.t | 45 + > test/lua-Harness-tests/lexico53/utf8.t | 179 ++++ > test/lua-Harness-tests/lexico54/lexico.t | 19 + > test/lua-Harness-tests/lexico54/metatable.t | 38 + > test/lua-Harness-tests/lexico54/utf8.t | 54 ++ > test/lua-Harness-tests/lexicojit/basic.t | 27 + > test/lua-Harness-tests/lexicojit/ext.t | 52 ++ > test/lua-Harness-tests/lexicojit/lexico.t | 32 + > test/lua-Harness-tests/profile.lua | 53 ++ > test/lua-Harness-tests/profile_lua51.lua | 46 + > .../profile_lua51_strict.lua | 46 + > test/lua-Harness-tests/profile_lua52.lua | 46 + > .../profile_lua52_strict.lua | 46 + > test/lua-Harness-tests/profile_lua53.lua | 52 ++ > .../profile_lua53_noconv.lua | 55 ++ > .../profile_lua53_strict.lua | 52 ++ > test/lua-Harness-tests/profile_lua54.lua | 52 ++ > .../profile_lua54_noconv.lua | 55 ++ > .../profile_lua54_strict.lua | 53 ++ > test/lua-Harness-tests/profile_luajit20.lua | 53 ++ > .../profile_luajit20_compat52.lua | 53 ++ > test/lua-Harness-tests/profile_luajit21.lua | 53 ++ > .../profile_luajit21_compat52.lua | 53 ++ > test/lua-Harness-tests/profile_openresty.lua | 53 ++ > test/lua-Harness-tests/profile_ravi.lua | 58 ++ > test/lua-Harness-tests/profile_tiny_fork.lua | 60 ++ > test/lua-Harness-tests/rx_captures | 13 + > test/lua-Harness-tests/rx_charclass | 38 + > test/lua-Harness-tests/rx_metachars | 117 +++ > test/lua-Harness-tests/tap.lua | 203 +++++ > 92 files changed, 12903 insertions(+), 1 deletion(-) > create mode 100755 test/lua-Harness-tests/000-sanity.t > create mode 100755 test/lua-Harness-tests/001-if.t > create mode 100755 test/lua-Harness-tests/002-table.t > create mode 100755 test/lua-Harness-tests/011-while.t > create mode 100755 test/lua-Harness-tests/012-repeat.t > create mode 100755 test/lua-Harness-tests/014-fornum.t > create mode 100755 test/lua-Harness-tests/015-forlist.t > create mode 100755 test/lua-Harness-tests/090-tap.t > create mode 100755 test/lua-Harness-tests/091-profile.t > create mode 100755 test/lua-Harness-tests/101-boolean.t > create mode 100755 test/lua-Harness-tests/102-function.t > create mode 100755 test/lua-Harness-tests/103-nil.t > create mode 100755 test/lua-Harness-tests/104-number.t > create mode 100755 test/lua-Harness-tests/105-string.t > create mode 100755 test/lua-Harness-tests/106-table.t > create mode 100755 test/lua-Harness-tests/107-thread.t > create mode 100755 test/lua-Harness-tests/108-userdata.t > create mode 100755 test/lua-Harness-tests/200-examples.t > create mode 100755 test/lua-Harness-tests/201-assign.t > create mode 100755 test/lua-Harness-tests/202-expr.t > create mode 100755 test/lua-Harness-tests/203-lexico.t > create mode 100755 test/lua-Harness-tests/204-grammar.t > create mode 100755 test/lua-Harness-tests/211-scope.t > create mode 100755 test/lua-Harness-tests/212-function.t > create mode 100755 test/lua-Harness-tests/213-closure.t > create mode 100755 test/lua-Harness-tests/214-coroutine.t > create mode 100755 test/lua-Harness-tests/221-table.t > create mode 100755 test/lua-Harness-tests/222-constructor.t > create mode 100755 test/lua-Harness-tests/223-iterator.t > create mode 100755 test/lua-Harness-tests/231-metatable.t > create mode 100755 test/lua-Harness-tests/232-object.t > create mode 100755 test/lua-Harness-tests/241-standalone.t > create mode 100755 test/lua-Harness-tests/242-luac.t > create mode 100755 test/lua-Harness-tests/301-basic.t > create mode 100755 test/lua-Harness-tests/303-package.t > create mode 100755 test/lua-Harness-tests/304-string.t > create mode 100755 test/lua-Harness-tests/305-utf8.t > create mode 100755 test/lua-Harness-tests/306-table.t > create mode 100755 test/lua-Harness-tests/307-math.t > create mode 100755 test/lua-Harness-tests/308-io.t > create mode 100755 test/lua-Harness-tests/309-os.t > create mode 100755 test/lua-Harness-tests/310-debug.t > create mode 100755 test/lua-Harness-tests/311-bit32.t > create mode 100755 test/lua-Harness-tests/314-regex.t > create mode 100755 test/lua-Harness-tests/320-stdin.t > create mode 100755 test/lua-Harness-tests/401-bitop.t > create mode 100755 test/lua-Harness-tests/402-ffi.t > create mode 100755 test/lua-Harness-tests/403-jit.t > create mode 100755 test/lua-Harness-tests/404-ext.t > create mode 100755 test/lua-Harness-tests/411-luajit.t > create mode 100644 test/lua-Harness-tests/CMakeLists.txt > create mode 100644 test/lua-Harness-tests/lexico52/lexico.t > create mode 100644 test/lua-Harness-tests/lexico53/boolean.t > create mode 100644 test/lua-Harness-tests/lexico53/function.t > create mode 100644 test/lua-Harness-tests/lexico53/lexico.t > create mode 100644 test/lua-Harness-tests/lexico53/nil.t > create mode 100644 test/lua-Harness-tests/lexico53/number.t > create mode 100644 test/lua-Harness-tests/lexico53/string.t > create mode 100644 test/lua-Harness-tests/lexico53/table.t > create mode 100644 test/lua-Harness-tests/lexico53/thread.t > create mode 100644 test/lua-Harness-tests/lexico53/userdata.t > create mode 100644 test/lua-Harness-tests/lexico53/utf8.t > create mode 100644 test/lua-Harness-tests/lexico54/lexico.t > create mode 100644 test/lua-Harness-tests/lexico54/metatable.t > create mode 100644 test/lua-Harness-tests/lexico54/utf8.t > create mode 100644 test/lua-Harness-tests/lexicojit/basic.t > create mode 100644 test/lua-Harness-tests/lexicojit/ext.t > create mode 100644 test/lua-Harness-tests/lexicojit/lexico.t > create mode 100644 test/lua-Harness-tests/profile.lua > create mode 100644 test/lua-Harness-tests/profile_lua51.lua > create mode 100644 test/lua-Harness-tests/profile_lua51_strict.lua > create mode 100644 test/lua-Harness-tests/profile_lua52.lua > create mode 100644 test/lua-Harness-tests/profile_lua52_strict.lua > create mode 100644 test/lua-Harness-tests/profile_lua53.lua > create mode 100644 test/lua-Harness-tests/profile_lua53_noconv.lua > create mode 100644 test/lua-Harness-tests/profile_lua53_strict.lua > create mode 100644 test/lua-Harness-tests/profile_lua54.lua > create mode 100644 test/lua-Harness-tests/profile_lua54_noconv.lua > create mode 100644 test/lua-Harness-tests/profile_lua54_strict.lua > create mode 100644 test/lua-Harness-tests/profile_luajit20.lua > create mode 100644 test/lua-Harness-tests/profile_luajit20_compat52.lua > create mode 100644 test/lua-Harness-tests/profile_luajit21.lua > create mode 100644 test/lua-Harness-tests/profile_luajit21_compat52.lua > create mode 100644 test/lua-Harness-tests/profile_openresty.lua > create mode 100644 test/lua-Harness-tests/profile_ravi.lua > create mode 100644 test/lua-Harness-tests/profile_tiny_fork.lua > create mode 100644 test/lua-Harness-tests/rx_captures > create mode 100644 test/lua-Harness-tests/rx_charclass > create mode 100644 test/lua-Harness-tests/rx_metachars > create mode 100644 test/lua-Harness-tests/tap.lua > > diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt > index 99471db..3a42f41 100644 > --- a/test/CMakeLists.txt > +++ b/test/CMakeLists.txt > @@ -43,10 +43,12 @@ endif() > set(LUAJIT_TEST_COMMAND "${LUAJIT_TEST_BINARY} -e dofile[[${LUAJIT_TEST_INIT}]]") > separate_arguments(LUAJIT_TEST_COMMAND) > > -add_subdirectory(tarantool-tests) > +add_subdirectory(lua-Harness-tests) > add_subdirectory(LuaJIT-tests) > +add_subdirectory(tarantool-tests) Why did you choose this order? > > add_custom_target(${PROJECT_NAME}-test DEPENDS > + lua-Harness-tests > LuaJIT-tests > tarantool-tests > ) > diff --git a/test/lua-Harness-tests/CMakeLists.txt b/test/lua-Harness-tests/CMakeLists.txt > new file mode 100644 > index 0000000..9b35e5a > --- /dev/null > +++ b/test/lua-Harness-tests/CMakeLists.txt > @@ -0,0 +1,49 @@ > +# Test suite that has been added from lua-Harness test suite > +# in scope of https://github.com/tarantool/tarantool/issues/4473. > + > +# See the rationale in the root CMakeLists.txt > +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) > + > +find_program(PROVE prove) > +if(NOT PROVE) > + message(WARNING "`prove' is not found, so lua-Harness-tests target is not generated") > + return() > +endif() > + > +set(LUA_TEST_FLAGS --failures --shuffle) Why did you drop TEST_DEPS variable containing the dependencies? > +if(CMAKE_VERBOSE_MAKEFILE) > + list(APPEND LUA_TEST_FLAGS --verbose) > +endif() > + > +string(CONCAT LUA_PATH > + "./?.lua\;" > + "${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;" > + "${LUAJIT_SOURCE_DIR}/?.lua\;" > +) There is not a word regarding such complex LUA_PATH configuration. > + > +string(CONCAT LUA_CPATH > + "./?${CMAKE_SHARED_LIBRARY_SUFFIX}\;" > + "${LUAJIT_SOURCE_DIR}/?${CMAKE_SHARED_LIBRARY_SUFFIX}\;" > +) Ditto. > + > +add_custom_target(lua-Harness-tests DEPENDS ${LUAJIT_TEST_BINARY}) > + > +add_custom_command(TARGET lua-Harness-tests > + COMMENT "Running lua-Harness tests" > + COMMAND > + env > + LUA_PATH="${LUA_PATH}\;" > + LUA_CPATH="${LUA_CPATH}\;" > + # Tarantool doesn't support LUA_INIT and most likely it > + # never will. > + # See https://github.com/tarantool/tarantool/issues/5744 > + # for more info. > + # So use less preferable way for tests. > + # See the root CMakeLists.txt for more info. Why do you need this comment here? You're using LUAJIT_TEST_COMMAND here, so if you need to explain its usage, it's better to leave a comment with the rationale right before its definition rather than each place it is used with prove. > + ${PROVE} ${CMAKE_CURRENT_SOURCE_DIR} > + --exec '${LUAJIT_TEST_COMMAND} -l profile_luajit21' > + ${LUA_TEST_FLAGS} > + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} > +) > + > +# vim: expandtab tabstop=2 shiftwidth=2 > -- > 2.28.0 > -- Best regards, IM