* [Tarantool-patches] [PATCH] build: another fix for luajit-tap tests cmake
@ 2020-10-13 14:27 Igor Munkin
2020-10-13 14:45 ` Alexander V. Tikhonov
2020-10-13 14:49 ` Kirill Yukhin
0 siblings, 2 replies; 3+ messages in thread
From: Igor Munkin @ 2020-10-13 14:27 UTC (permalink / raw)
To: Kirill Yukhin, Alexander V. Tikhonov; +Cc: tarantool-patches
Fixes the regression from e5039742eba89936bf2f8c5aebc8f21c810710d5
('luajit: bump new version').
Reported-by: Alexander Tikhonov <avtikhon@tarantool.org>
Signed-off-by: Igor Munkin <imun@tarantool.org>
---
Branch: https://github.com/tarantool/tarantool/tree/imun/luajit-tests-fixup-again
test/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c8759703c..7b28e2bd4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -77,6 +77,7 @@ add_subdirectory(box-tap)
add_subdirectory(unit)
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/gh-4427-ffi-sandwich ${PROJECT_BINARY_DIR}/third_party/luajit/test/gh-4427-ffi-sandwich)
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/lj-flush-on-trace ${PROJECT_BINARY_DIR}/third_party/luajit/test/lj-flush-on-trace)
+add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/misclib-getmetrics-capi ${PROJECT_BINARY_DIR}/third_party/luajit/test/misclib-getmetrics-capi)
# Move tarantoolctl config
if (NOT ${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
--
2.25.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Tarantool-patches] [PATCH] build: another fix for luajit-tap tests cmake
2020-10-13 14:27 [Tarantool-patches] [PATCH] build: another fix for luajit-tap tests cmake Igor Munkin
@ 2020-10-13 14:45 ` Alexander V. Tikhonov
2020-10-13 14:49 ` Kirill Yukhin
1 sibling, 0 replies; 3+ messages in thread
From: Alexander V. Tikhonov @ 2020-10-13 14:45 UTC (permalink / raw)
To: Igor Munkin; +Cc: tarantool-patches
Hi Igor, thanks for the fast fix. I've checked it and saw that it really
fixed the issue. Patch LGTM.
On Tue, Oct 13, 2020 at 05:27:24PM +0300, Igor Munkin wrote:
> Fixes the regression from e5039742eba89936bf2f8c5aebc8f21c810710d5
> ('luajit: bump new version').
>
> Reported-by: Alexander Tikhonov <avtikhon@tarantool.org>
> Signed-off-by: Igor Munkin <imun@tarantool.org>
> ---
>
> Branch: https://github.com/tarantool/tarantool/tree/imun/luajit-tests-fixup-again
>
> test/CMakeLists.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
> index c8759703c..7b28e2bd4 100644
> --- a/test/CMakeLists.txt
> +++ b/test/CMakeLists.txt
> @@ -77,6 +77,7 @@ add_subdirectory(box-tap)
> add_subdirectory(unit)
> add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/gh-4427-ffi-sandwich ${PROJECT_BINARY_DIR}/third_party/luajit/test/gh-4427-ffi-sandwich)
> add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/lj-flush-on-trace ${PROJECT_BINARY_DIR}/third_party/luajit/test/lj-flush-on-trace)
> +add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/luajit/test/misclib-getmetrics-capi ${PROJECT_BINARY_DIR}/third_party/luajit/test/misclib-getmetrics-capi)
>
> # Move tarantoolctl config
> if (NOT ${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
> --
> 2.25.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Tarantool-patches] [PATCH] build: another fix for luajit-tap tests cmake
2020-10-13 14:27 [Tarantool-patches] [PATCH] build: another fix for luajit-tap tests cmake Igor Munkin
2020-10-13 14:45 ` Alexander V. Tikhonov
@ 2020-10-13 14:49 ` Kirill Yukhin
1 sibling, 0 replies; 3+ messages in thread
From: Kirill Yukhin @ 2020-10-13 14:49 UTC (permalink / raw)
To: Igor Munkin; +Cc: tarantool-patches
Hello,
On 13 окт 17:27, Igor Munkin wrote:
> Fixes the regression from e5039742eba89936bf2f8c5aebc8f21c810710d5
> ('luajit: bump new version').
>
> Reported-by: Alexander Tikhonov <avtikhon@tarantool.org>
> Signed-off-by: Igor Munkin <imun@tarantool.org>
I've checked your patch into 1.10, 2.4, 2.5 and master.
--
Regards, Kirill Yukhin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-13 14:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-13 14:27 [Tarantool-patches] [PATCH] build: another fix for luajit-tap tests cmake Igor Munkin
2020-10-13 14:45 ` Alexander V. Tikhonov
2020-10-13 14:49 ` Kirill Yukhin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox