* [Tarantool-patches] [PATCH] luajit: bump new version
@ 2021-04-05 17:22 Igor Munkin via Tarantool-patches
2021-04-06 5:36 ` Alexander V. Tikhonov via Tarantool-patches
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-04-05 17:22 UTC (permalink / raw)
To: Alexander V . Tikhonov, Sergey Kaplun; +Cc: 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 <imun@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Tarantool-patches] [PATCH] luajit: bump new version
2021-04-05 17:22 [Tarantool-patches] [PATCH] luajit: bump new version Igor Munkin via Tarantool-patches
@ 2021-04-06 5:36 ` Alexander V. Tikhonov via Tarantool-patches
2021-04-07 17:33 ` Igor Munkin via Tarantool-patches
2021-04-07 16:53 ` Sergey Kaplun via Tarantool-patches
2021-04-07 21:20 ` Igor Munkin via Tarantool-patches
2 siblings, 1 reply; 6+ messages in thread
From: Alexander V. Tikhonov via Tarantool-patches @ 2021-04-06 5:36 UTC (permalink / raw)
To: Igor Munkin; +Cc: tarantool-patches
Hi Igor, thanks for the patch, as I see no new degradation found in
Github Actions testing commit criteria [1], patch LGTM.
[1] - https://github.com/tarantool/tarantool/tree/imun/gh-5959-fix-dynamic-modules-loading-on-macos
On Mon, Apr 05, 2021 at 08:22:47PM +0300, Igor Munkin wrote:
> 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>
> ---
>
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Tarantool-patches] [PATCH] luajit: bump new version
2021-04-05 17:22 [Tarantool-patches] [PATCH] luajit: bump new version Igor Munkin via Tarantool-patches
2021-04-06 5:36 ` Alexander V. Tikhonov via Tarantool-patches
@ 2021-04-07 16:53 ` Sergey Kaplun via Tarantool-patches
2021-04-07 17:33 ` Igor Munkin via Tarantool-patches
2021-04-07 21:20 ` Igor Munkin via Tarantool-patches
2 siblings, 1 reply; 6+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2021-04-07 16:53 UTC (permalink / raw)
To: Igor Munkin; +Cc: tarantool-patches
Hi, Igor!
Thanks for the patch!
LGTM.
--
Best regards,
Sergey Kaplun
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Tarantool-patches] [PATCH] luajit: bump new version
2021-04-06 5:36 ` Alexander V. Tikhonov via Tarantool-patches
@ 2021-04-07 17:33 ` Igor Munkin via Tarantool-patches
0 siblings, 0 replies; 6+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-04-07 17:33 UTC (permalink / raw)
To: Alexander V. Tikhonov; +Cc: tarantool-patches
Sasha,
Thanks for your review!
On 06.04.21, Alexander V. Tikhonov wrote:
> Hi Igor, thanks for the patch, as I see no new degradation found in
> Github Actions testing commit criteria [1], patch LGTM.
Added your patch:
| Reviewed-by: Alexander V. Tikhonov <avtikhon@tarantool.org>
>
> [1] - https://github.com/tarantool/tarantool/tree/imun/gh-5959-fix-dynamic-modules-loading-on-macos
>
> On Mon, Apr 05, 2021 at 08:22:47PM +0300, Igor Munkin wrote:
> > 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>
> > ---
> >
> > 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(-)
> >
<snipped>
> > --
> > 2.25.0
> >
--
Best regards,
IM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Tarantool-patches] [PATCH] luajit: bump new version
2021-04-07 16:53 ` Sergey Kaplun via Tarantool-patches
@ 2021-04-07 17:33 ` Igor Munkin via Tarantool-patches
0 siblings, 0 replies; 6+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-04-07 17:33 UTC (permalink / raw)
To: Sergey Kaplun; +Cc: tarantool-patches
Sergey,
Thanks for your review!
On 07.04.21, Sergey Kaplun wrote:
> Hi, Igor!
>
> Thanks for the patch!
>
> LGTM.
Added your tag:
| Reviewed-by: Sergey Kaplun <skaplun@tarantool.org>
>
> --
> Best regards,
> Sergey Kaplun
--
Best regards,
IM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Tarantool-patches] [PATCH] luajit: bump new version
2021-04-05 17:22 [Tarantool-patches] [PATCH] luajit: bump new version Igor Munkin via Tarantool-patches
2021-04-06 5:36 ` Alexander V. Tikhonov via Tarantool-patches
2021-04-07 16:53 ` Sergey Kaplun via Tarantool-patches
@ 2021-04-07 21:20 ` Igor Munkin via Tarantool-patches
2 siblings, 0 replies; 6+ messages in thread
From: Igor Munkin via Tarantool-patches @ 2021-04-07 21:20 UTC (permalink / raw)
To: Alexander V . Tikhonov, Sergey Kaplun; +Cc: tarantool-patches
I've checked the patch into 1.10, 2.6, 2.7 and master.
On 05.04.21, Igor Munkin wrote:
> 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>
> ---
>
> 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(-)
>
<snipped>
> --
> 2.25.0
>
--
Best regards,
IM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-07 21:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-05 17:22 [Tarantool-patches] [PATCH] luajit: bump new version Igor Munkin via Tarantool-patches
2021-04-06 5:36 ` Alexander V. Tikhonov via Tarantool-patches
2021-04-07 17:33 ` Igor Munkin via Tarantool-patches
2021-04-07 16:53 ` Sergey Kaplun via Tarantool-patches
2021-04-07 17:33 ` Igor Munkin via Tarantool-patches
2021-04-07 21:20 ` Igor Munkin via Tarantool-patches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox