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 E5BCF6EC5D; Mon, 5 Apr 2021 20:22:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E5BCF6EC5D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617643379; bh=wSZZ8Ax5fqkLIz0/aN759mSYA3PEg1j8HhaLOqUqabo=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=IuDL0S3ZNRmFORAJABXy7JFmWNwY0Yn7wUHgQVBXHajqK2cxQzD7OCays5G5qe3Mz /CR9rh1rYuLnE2mjVoRehWlW8yvS/0YusjaLja8zqcyhW5YiLs5kKD5MDfoCZgpSBD pw4zO2FF6J04YvfUUrAdegbmkwmoWsxhTFGcx/kA= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 A6A2D6EC5D for ; Mon, 5 Apr 2021 20:22:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A6A2D6EC5D Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lTSwD-00040Q-EL; Mon, 05 Apr 2021 20:22:57 +0300 To: "Alexander V . Tikhonov" , Sergey Kaplun Date: Mon, 5 Apr 2021 20:22:47 +0300 Message-Id: <3eb9580caf0d165f926694a8e0a201494aa25b89.1617642930.git.imun@tarantool.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9ED7173E37F4E32947427BE79D20CABD433B5E0F054050395182A05F538085040F69D0B05EF2F08F99F9DF753A3D5732CB469EEE98914364997B32951628E18BF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE79961E86438F5BDAEEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637329F9579A0E72DCC8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C16EE06F5A270FE6A6B84BE8AFEA52145D530A99A771A2109A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3CF36E64A7E3F8E58117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F790063788B3B24285A3CD0EEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C16EE06F5A270FE6A6B84BE8AFEA52145D530A99A771A21099C2B6934AE262D3EE7EAB7254005DCEDE285C580305385EE1E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0279E343DB675BB2F8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3473457D764E1CDE77F5BF9232F431FBD157D13CE4BB93501817ECD52B9231618A7318D16F30A6B8CB1D7E09C32AA3244C684FC4F8FE079CDA9E21B71CB047FA3124AF4FAF06DA24FD927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojM00ve/f+0olneO+jxHH9Ow== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822DCCBB4C9D79F75BA7DC0C9C92F15258CA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH] luajit: bump new version 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" LuaJIT submodule is bumped to introduce the following changes: * test: fix dynamic modules loading on MacOS * test: make utils.selfrun usage easier * test: remove excess dependency for tests target Within this changeset SIP issues are worked around and dynamic modules loading on MacOS is fixed. As a result LuaJIT tests can be enabled for static build target on MacOS. Closes #5959 Follows up #4862 Signed-off-by: Igor Munkin --- Honestly, this patch is sent mostly to inform our QA master that as a result of LuaJIT-related patch our CI finally runs LuaJIT tests for all existing testing pipelines. Issue: https://github.com/tarantool/tarantool/issues/5959 Branch: https://github.com/tarantool/luajit/tree/imun/gh-5959-fix-dynamic-modules-loading-on-macos LuaJIT-related series: https://lists.tarantool.org/tarantool-patches/cover.1617641697.git.imun@tarantool.org/T/#t .travis.mk | 11 +---------- third_party/luajit | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.mk b/.travis.mk index d5de14207..e3a761984 100644 --- a/.travis.mk +++ b/.travis.mk @@ -383,16 +383,7 @@ test_static_build_cmake_osx_no_deps: sysctl vm.swapusage cd static-build && cmake -DCMAKE_TARANTOOL_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DENABLE_WERROR=ON" . && \ make -j && ctest -V - # FIXME: Hell with SIP on OSX: Tarantool (and also LuaJIT) - # is built out of sources, so the test located in the - # source directory fails to load the shared library built - # in the binary directory via dlopen(3). - # For more info, proceed the link below: - # https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/FileSystemProtections/FileSystemProtections.html - # Do not run LuaJIT related tests for this built until the - # issue is not resolved. - # - # make -C ${PWD}/static-build/tarantool-prefix/src/tarantool-build LuaJIT-test + make -C ${PWD}/static-build/tarantool-prefix/src/tarantool-build LuaJIT-test ${INIT_TEST_ENV_OSX}; \ cd test && ./test-run.py --vardir ${OSX_VARDIR} \ --builddir ${PWD}/static-build/tarantool-prefix/src/tarantool-build \ diff --git a/third_party/luajit b/third_party/luajit index cdf98db6f..6ca801054 160000 --- a/third_party/luajit +++ b/third_party/luajit @@ -1 +1 @@ -Subproject commit cdf98db6f5b8dd5c51b1070ab309de823681763c +Subproject commit 6ca8010540a67a92b36327abf44b489ebddc5054 -- 2.25.0