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 947847037D; Thu, 11 Aug 2022 14:29:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 947847037D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1660217349; bh=lKubI8ZfuYYYZMw+IDGPnrwBlSrEApqzIe3dzJEMFqk=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kStQM3CsFHxEprJnIPpgFgVO4oVxyktCbTC2QeY0z141ZtylEHJOfbG78C3/JXODd 5+lhy1rsROvYJ3hHfePxHIb9j280yPXD+EB7LFnLcbhZjDYDYfkZ7Ak+qd3n2+x16P selAbY8ssLCrOQ5RX0bzdVLiVr1e3tUF91sLXe9w= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [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 BEAAA7188E for ; Thu, 11 Aug 2022 14:27:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BEAAA7188E Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1oM6Lj-0002YE-0e; Thu, 11 Aug 2022 14:27:39 +0300 To: Sergey Kaplun , Sergey Bronnikov Date: Thu, 11 Aug 2022 14:17:42 +0300 Message-Id: <668f70ffe4f25725ff4e7a53f5fed7f1505943b0.1660216002.git.imun@tarantool.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD999D8F08CF16C6CA7AE777BCDF00156E450145138C04977EA00894C459B0CD1B9115054C78469E6E003B80BD22C633C361C9930A848CFA68E49B610CA6D60D10F X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C2204D4F9A221771EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370218B86C916BF3528638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D813DEFFCE6838EA1450FE1B28816ED0D5117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC93A51A5089774A2DA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B60A62CEF541B197C8089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C41E93BD56E7067354307CAA32FF218580205367B2BCC23E5B0D53CE0FDF8446B28329FE0B6AC8C886CFC4036BBF6A4EA9BF8C51168CD8EBDBAE9A1BBD95851C5BBCD5413C93A139628A5251AA20633D26296C473AB1E142185630BBE1189BB6CF7866D6147AF826D813DEFFCE6838EA1450FE1B28816ED0D5F972CCD2F8FE1EF1CFC4036BBF6A4EA9EDCF5861DED71B2F3D58D961240FA4EF6DABF04D5057A81F1E618B5D5F965AFDB936CB490224F2464EEA7BD89490CAC0EDDA962BC3F61961 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EA882B598A2098116A39EC3D9D2612EDEEB7BA73F05EAE221B207AC1131D4DC49E13FF06C3A355F51D7E09C32AA3244C09E4C601A35507617C8EFCC0FA3B588BA995755A1445935E927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojfXJM3siCnCmpofevprzMPQ== X-Mailru-Sender: 689FA8AB762F7393CC2E0F076E87284E897732F5D33C90FE12F7A16A2E6AFBD4A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 3/8] test: fix tarantool suite for out of source build 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" jit/vmdef.lua is autogenerated file, so it's put to src/ directory located in scope of the binary artefacts tree. Before the patch LUA_PATH lacks this path, so tarantool-tests target fails due to jit/vmdef.lua misseek. As a result of this change src/ directory in scope of the binary tree is included to LUA_PATH as well as the one from the source tree has been. Signed-off-by: Igor Munkin --- test/tarantool-tests/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt index 27866869..97c23670 100644 --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -70,14 +70,17 @@ add_subdirectory(misclib-sysprof-capi) # The part of the memory profiler toolchain is located in tools # directory, jit, profiler, and bytecode toolchains are located -# in src/ directory and auxiliary tests-related modules are -# located in the current directory (but tests are run in the -# binary directory), so LUA_PATH need to be updated. +# in src/ directory, jit/vmdef.lua is autogenerated file also +# located in src/ directory, but in scope of the binary artefacts +# tree and auxiliary tests-related modules are located in the +# current directory (but tests are run in the binary directory), +# so LUA_PATH need to be updated. make_lua_path(LUA_PATH PATHS ${CMAKE_CURRENT_SOURCE_DIR}/?.lua ${PROJECT_SOURCE_DIR}/tools/?.lua ${PROJECT_SOURCE_DIR}/src/?.lua + ${PROJECT_BINARY_DIR}/src/?.lua ) # Update LUA_CPATH with the library paths collected within # macro. -- 2.34.0