Skip to content

Commit

Permalink
luajit: bump new version
Browse files Browse the repository at this point in the history
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@tarantool.org>
  • Loading branch information
igormunkin committed Apr 5, 2021
1 parent 22e2e4e commit 3eb9580
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
11 changes: 1 addition & 10 deletions .travis.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 3eb9580

Please sign in to comment.