[Tarantool-patches] [PATCH] luajit: bump new version

Igor Munkin imun at tarantool.org
Mon Apr 5 20:22:47 MSK 2021


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 <imun at tarantool.org>
---

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



More information about the Tarantool-patches mailing list