* [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests
@ 2024-12-06 7:05 Sergey Bronnikov via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash Sergey Bronnikov via Tarantool-patches
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2024-12-06 7:05 UTC (permalink / raw)
To: tarantool-patches, Sergey Kaplun, Maxim Kokryashkin
From: Sergey Bronnikov <sergeyb@tarantool.org>
Tests for sysprof is enabled when sysprof support is disabled
(macro LUAJIT_DISABLE_SYSPROF). The patch add skips in such case.
Branch: https://github.com/tarantool/luajit/tree/ligurio/gh-xxxx-skip-sysprof-tests
PR: https://github.com/tarantool/tarantool/pull/10898
Sergey Bronnikov (2):
test: small fixes in gh-8594-sysprof-ffunc-crash
test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF
test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c | 8 ++++++--
test/tarantool-c-tests/misclib-sysprof-capi.test.c | 4 ++++
test/tarantool-tests/CMakeLists.txt | 4 ++++
.../profilers/gh-5688-tool-cli-flag.test.lua | 2 ++
.../profilers/gh-5813-resolving-of-c-symbols.test.lua | 2 ++
.../gh-7264-add-proto-trace-sysprof-default.test.lua | 2 ++
.../gh-9217-profile-parsers-error-handling.test.lua | 2 ++
.../profilers/misclib-sysprof-lapi.test.lua | 2 ++
8 files changed, 24 insertions(+), 2 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash
2024-12-06 7:05 [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Bronnikov via Tarantool-patches
@ 2024-12-06 7:06 ` Sergey Bronnikov via Tarantool-patches
2024-12-06 7:55 ` Sergey Kaplun via Tarantool-patches
2024-12-11 12:24 ` Maxim Kokryashkin via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF Sergey Bronnikov via Tarantool-patches
2024-12-17 12:23 ` [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Kaplun via Tarantool-patches
2 siblings, 2 replies; 10+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2024-12-06 7:06 UTC (permalink / raw)
To: tarantool-patches, Sergey Kaplun, Maxim Kokryashkin
From: Sergey Bronnikov <sergeyb@tarantool.org>
- fix a typo in a comment
- replace `skip_all()` with `skip()` because it is strange
to skip overall test group inside a testcase.
---
test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
index cf1d815a..a8de3358 100644
--- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
+++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
@@ -17,7 +17,7 @@
/*
* XXX: The test is *very* Linux/x86_64 specific. Fortunately, so
- * does the sampling profiler. <lj_arch.> is needed for LUAJIT_OS
+ * does the sampling profiler. <lj_arch.h> is needed for LUAJIT_OS
* and LUAJIT_TARGET.
*/
#include "lj_arch.h"
@@ -270,7 +270,7 @@ static int test_tostring_call(void *ctx)
static int test_tostring_call(void *ctx)
{
- return skip_all("sysprof is implemented for Linux/x86_64 only");
+ return skip("sysprof is implemented for Linux/x86_64 only");
}
#endif /* LUAJIT_OS == LUAJIT_OS_LINUX && LUAJIT_TARGET == LUAJIT_ARCH_X64 */
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF
2024-12-06 7:05 [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Bronnikov via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash Sergey Bronnikov via Tarantool-patches
@ 2024-12-06 7:06 ` Sergey Bronnikov via Tarantool-patches
2024-12-06 8:08 ` Sergey Kaplun via Tarantool-patches
2024-12-11 12:25 ` Maxim Kokryashkin via Tarantool-patches
2024-12-17 12:23 ` [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Kaplun via Tarantool-patches
2 siblings, 2 replies; 10+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2024-12-06 7:06 UTC (permalink / raw)
To: tarantool-patches, Sergey Kaplun, Maxim Kokryashkin
From: Sergey Bronnikov <sergeyb@tarantool.org>
LuaJIT has a macro LUAJIT_DISABLE_SYSPROF that disable
sysprof support. Sysprof tests doesn't respect this macro
and therefore some of them failed when macro is enabled.
The proposed patch:
- skip sysprof testcases in a suite tarantool-c-tests
- introduce an environment variable LUAJIT_DISABLE_SYSPROF in
a suite tarantool-tests that set to 1 when sysprof support is
disabled
- propagate a status of sysprof support to Lua tests and skip
testing when sysprof is disabled
---
test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c | 4 ++++
test/tarantool-c-tests/misclib-sysprof-capi.test.c | 4 ++++
test/tarantool-tests/CMakeLists.txt | 4 ++++
test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua | 2 ++
.../profilers/gh-5813-resolving-of-c-symbols.test.lua | 2 ++
.../gh-7264-add-proto-trace-sysprof-default.test.lua | 2 ++
.../profilers/gh-9217-profile-parsers-error-handling.test.lua | 2 ++
test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua | 2 ++
8 files changed, 22 insertions(+)
diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
index a8de3358..de4fb2c4 100644
--- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
+++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
@@ -277,8 +277,12 @@ static int test_tostring_call(void *ctx)
int main(void)
{
+#if LUAJIT_DISABLE_SYSPROF
+ return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
+#else /* LUAJIT_DISABLE_SYSPROF */
const struct test_unit tgroup[] = {
test_unit_def(test_tostring_call),
};
return test_run_group(tgroup, NULL);
+#endif /* LUAJIT_DISABLE_SYSPROF */
}
diff --git a/test/tarantool-c-tests/misclib-sysprof-capi.test.c b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
index 6f53d488..ec3354cc 100644
--- a/test/tarantool-c-tests/misclib-sysprof-capi.test.c
+++ b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
@@ -301,6 +301,9 @@ static int profile_func_jiton(void *test_state)
int main(void)
{
+#if LUAJIT_DISABLE_SYSPROF
+ return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
+#else /* LUAJIT_DISABLE_SYSPROF */
if (LUAJIT_OS != LUAJIT_OS_LINUX)
return skip_all("Sysprof is implemented for Linux only");
if (LUAJIT_TARGET != LUAJIT_ARCH_X86
@@ -322,4 +325,5 @@ int main(void)
const int test_result = test_run_group(tgroup, L);
utils_lua_close(L);
return test_result;
+#endif /* LUAJIT_DISABLE_SYSPROF */
}
diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 8bdb2cf3..a6e39f6c 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -89,6 +89,10 @@ if(LUAJIT_ENABLE_TABLE_BUMP)
list(APPEND LUA_TEST_ENV_MORE LUAJIT_TABLE_BUMP=1)
endif()
+if(LUAJIT_DISABLE_SYSPROF)
+ list(APPEND LUA_TEST_ENV_MORE LUAJIT_DISABLE_SYSPROF=1)
+endif()
+
set(TEST_SUITE_NAME "tarantool-tests")
# XXX: The call produces both test and target
diff --git a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
index f935dc5b..379ccf8e 100644
--- a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
+++ b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
@@ -1,4 +1,5 @@
local tap = require('tap')
+local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
jit.arch ~= 'x64',
@@ -7,6 +8,7 @@ local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
['No profile tools CLI option integration'] = _TARANTOOL,
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
+ ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
})
test:plan(3)
diff --git a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
index 74bcd9e8..ff745225 100644
--- a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
+++ b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
@@ -1,10 +1,12 @@
local tap = require("tap")
+local no_sysprof = os.getenv("LUAJIT_DISABLE_SYSPROF")
local test = tap.test("gh-5813-resolving-of-c-symbols"):skipcond({
["Memprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
jit.arch ~= "x64",
["Memprof is implemented for Linux only"] = jit.os ~= "Linux",
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
+ ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
})
test:plan(5)
diff --git a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
index 176c1a15..e09016e7 100644
--- a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
+++ b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
@@ -1,4 +1,5 @@
local tap = require('tap')
+local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
['Test requires JIT enabled'] = not jit.status(),
['Sysprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and
@@ -6,6 +7,7 @@ local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
['Sysprof is implemented for Linux only'] = jit.os ~= 'Linux',
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
+ ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
})
test:plan(2)
diff --git a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
index 65c51198..012b1501 100644
--- a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
+++ b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
@@ -1,4 +1,5 @@
local tap = require('tap')
+local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
jit.arch ~= 'x64',
@@ -7,6 +8,7 @@ local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
['No profile tools CLI option integration'] = _TARANTOOL,
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
+ ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
})
jit.off()
diff --git a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
index 26c277cd..ea5ca9a9 100644
--- a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
+++ b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
@@ -1,10 +1,12 @@
local tap = require("tap")
+local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test("misc-sysprof-lapi"):skipcond({
["Sysprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
jit.arch ~= "x64",
["Sysprof is implemented for Linux only"] = jit.os ~= "Linux",
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
+ ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
})
test:plan(19)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash Sergey Bronnikov via Tarantool-patches
@ 2024-12-06 7:55 ` Sergey Kaplun via Tarantool-patches
2024-12-06 10:16 ` Sergey Bronnikov via Tarantool-patches
2024-12-11 12:24 ` Maxim Kokryashkin via Tarantool-patches
1 sibling, 1 reply; 10+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2024-12-06 7:55 UTC (permalink / raw)
To: Sergey Bronnikov; +Cc: tarantool-patches
Hi, Sergey!
Thanks for the patch!
LGTM, with a few nits regarding the commit message.
On 06.12.24, Sergey Bronnikov wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
>
> - fix a typo in a comment
Typo? /fix/Fix/
Typo? /comment/comment./
> - replace `skip_all()` with `skip()` because it is strange
Typo? /replace/Replace/
> to skip overall test group inside a testcase.
Typo: s/overall test group/the overall test group/
> ---
<snipped>
--
Best regards,
Sergey Kaplun
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF Sergey Bronnikov via Tarantool-patches
@ 2024-12-06 8:08 ` Sergey Kaplun via Tarantool-patches
2024-12-06 10:31 ` Sergey Bronnikov via Tarantool-patches
2024-12-11 12:25 ` Maxim Kokryashkin via Tarantool-patches
1 sibling, 1 reply; 10+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2024-12-06 8:08 UTC (permalink / raw)
To: Sergey Bronnikov; +Cc: tarantool-patches
Hi, Sergey!
Thanks for the patch!
LGTM, with a minor comment below.
On 06.12.24, Sergey Bronnikov wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
>
> LuaJIT has a macro LUAJIT_DISABLE_SYSPROF that disable
Typo: s/disable/disables/
> sysprof support. Sysprof tests doesn't respect this macro
Typo: s/doesn't/don't/
Typo: s/macro/macro,/
> and therefore some of them failed when macro is enabled.
Typo: /macro/macro,/
>
> The proposed patch:
This isn't proposed patch, but it is just patch, so:
s/proposed //
>
> - skip sysprof testcases in a suite tarantool-c-tests
Typo: /skip/Skips/
Missed dot at the end of the sentence.
> - introduce an environment variable LUAJIT_DISABLE_SYSPROF in
Typo: s/introduce/Introduces/
> a suite tarantool-tests that set to 1 when sysprof support is
Typo: s/set/is set/
> disabled
Missed dot at the end of the sentence.
> - propagate a status of sysprof support to Lua tests and skip
Typo: s/propagate/Propagates
> testing when sysprof is disabled
Missed dot at the end of the sentence.
> ---
> test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c | 4 ++++
> test/tarantool-c-tests/misclib-sysprof-capi.test.c | 4 ++++
> test/tarantool-tests/CMakeLists.txt | 4 ++++
> test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua | 2 ++
> .../profilers/gh-5813-resolving-of-c-symbols.test.lua | 2 ++
> .../gh-7264-add-proto-trace-sysprof-default.test.lua | 2 ++
> .../profilers/gh-9217-profile-parsers-error-handling.test.lua | 2 ++
> test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua | 2 ++
> 8 files changed, 22 insertions(+)
>
> diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
> index a8de3358..de4fb2c4 100644
> --- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
> +++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
> @@ -277,8 +277,12 @@ static int test_tostring_call(void *ctx)
>
> int main(void)
> {
> +#if LUAJIT_DISABLE_SYSPROF
> + return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
Minor: I suppose we can drop the LUAJIT_DISABLE_SYSPROF mentioning since
it becomes "maslo maslyanoe", for my taste.
Feel free to ignore.
> +#else /* LUAJIT_DISABLE_SYSPROF */
<snipped>
> diff --git a/test/tarantool-c-tests/misclib-sysprof-capi.test.c b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
> index 6f53d488..ec3354cc 100644
> --- a/test/tarantool-c-tests/misclib-sysprof-capi.test.c
> +++ b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
> @@ -301,6 +301,9 @@ static int profile_func_jiton(void *test_state)
>
> int main(void)
> {
> +#if LUAJIT_DISABLE_SYSPROF
> + return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
Ditto.
> +#else /* LUAJIT_DISABLE_SYSPROF */
> if (LUAJIT_OS != LUAJIT_OS_LINUX)
> return skip_all("Sysprof is implemented for Linux only");
> if (LUAJIT_TARGET != LUAJIT_ARCH_X86
> @@ -322,4 +325,5 @@ int main(void)
> const int test_result = test_run_group(tgroup, L);
> utils_lua_close(L);
> return test_result;
> +#endif /* LUAJIT_DISABLE_SYSPROF */
> }
> diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
> index 8bdb2cf3..a6e39f6c 100644
> --- a/test/tarantool-tests/CMakeLists.txt
> +++ b/test/tarantool-tests/CMakeLists.txt
> @@ -89,6 +89,10 @@ if(LUAJIT_ENABLE_TABLE_BUMP)
> list(APPEND LUA_TEST_ENV_MORE LUAJIT_TABLE_BUMP=1)
> endif()
>
> +if(LUAJIT_DISABLE_SYSPROF)
> + list(APPEND LUA_TEST_ENV_MORE LUAJIT_DISABLE_SYSPROF=1)
> +endif()
> +
> set(TEST_SUITE_NAME "tarantool-tests")
>
> # XXX: The call produces both test and target
> diff --git a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
> index f935dc5b..379ccf8e 100644
> --- a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
> +++ b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
> @@ -1,4 +1,5 @@
> local tap = require('tap')
> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
> local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
> ['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
> jit.arch ~= 'x64',
> @@ -7,6 +8,7 @@ local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
> ['No profile tools CLI option integration'] = _TARANTOOL,
> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
> + ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
Minor: "disabled due to disable" sounds like "maslo maslyanoe" for my
taste. I suppose "Sysprof is disabled" is just enough. As a minor bonus,
we may avoid the declaration of the `no_sysprof` variable since we can
just use one-line `os.getenv()` that fits into this line now.
Same for the other Lua tests.
> })
>
> test:plan(3)
> diff --git a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
> index 74bcd9e8..ff745225 100644
> --- a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
> +++ b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
> @@ -1,10 +1,12 @@
> local tap = require("tap")
> +local no_sysprof = os.getenv("LUAJIT_DISABLE_SYSPROF")
> local test = tap.test("gh-5813-resolving-of-c-symbols"):skipcond({
> ["Memprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
> jit.arch ~= "x64",
> ["Memprof is implemented for Linux only"] = jit.os ~= "Linux",
> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
> ["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
> + ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
> })
>
> test:plan(5)
> diff --git a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
> index 176c1a15..e09016e7 100644
> --- a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
> +++ b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
> @@ -1,4 +1,5 @@
> local tap = require('tap')
> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
> local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
> ['Test requires JIT enabled'] = not jit.status(),
> ['Sysprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and
> @@ -6,6 +7,7 @@ local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
> ['Sysprof is implemented for Linux only'] = jit.os ~= 'Linux',
> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
> + ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
> })
>
> test:plan(2)
> diff --git a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
> index 65c51198..012b1501 100644
> --- a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
> +++ b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
> @@ -1,4 +1,5 @@
> local tap = require('tap')
> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
> local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
> ['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
> jit.arch ~= 'x64',
> @@ -7,6 +8,7 @@ local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
> ['No profile tools CLI option integration'] = _TARANTOOL,
> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
> + ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
> })
>
> jit.off()
> diff --git a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
> index 26c277cd..ea5ca9a9 100644
> --- a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
> +++ b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
> @@ -1,10 +1,12 @@
> local tap = require("tap")
> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
> local test = tap.test("misc-sysprof-lapi"):skipcond({
> ["Sysprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
> jit.arch ~= "x64",
> ["Sysprof is implemented for Linux only"] = jit.os ~= "Linux",
> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
> ["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
> + ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
> })
>
> test:plan(19)
> --
> 2.34.1
>
--
Best regards,
Sergey Kaplun
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash
2024-12-06 7:55 ` Sergey Kaplun via Tarantool-patches
@ 2024-12-06 10:16 ` Sergey Bronnikov via Tarantool-patches
0 siblings, 0 replies; 10+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2024-12-06 10:16 UTC (permalink / raw)
To: Sergey Kaplun; +Cc: Sergey Bronnikov, tarantool-patches
Hi, Sergey,
fixes applied and force-pushed.
On 10:55 Fri 06 Dec , Sergey Kaplun wrote:
>Hi, Sergey!
>Thanks for the patch!
>LGTM, with a few nits regarding the commit message.
>
>On 06.12.24, Sergey Bronnikov wrote:
>> From: Sergey Bronnikov <sergeyb@tarantool.org>
>>
>> - fix a typo in a comment
>
>Typo? /fix/Fix/
>Typo? /comment/comment./
Fixed.
>
>> - replace `skip_all()` with `skip()` because it is strange
>
>Typo? /replace/Replace/
Fixed.
>
>> to skip overall test group inside a testcase.
>
>Typo: s/overall test group/the overall test group/
Fixed.
>
>> ---
>
><snipped>
>
>
>--
>Best regards,
>Sergey Kaplun
--
sergeyb@
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF
2024-12-06 8:08 ` Sergey Kaplun via Tarantool-patches
@ 2024-12-06 10:31 ` Sergey Bronnikov via Tarantool-patches
0 siblings, 0 replies; 10+ messages in thread
From: Sergey Bronnikov via Tarantool-patches @ 2024-12-06 10:31 UTC (permalink / raw)
To: Sergey Kaplun; +Cc: Sergey Bronnikov, tarantool-patches
Hi, Sergey,
fixes applied and force-pushed.
On 11:08 Fri 06 Dec , Sergey Kaplun wrote:
>Hi, Sergey!
>Thanks for the patch!
>LGTM, with a minor comment below.
>
>On 06.12.24, Sergey Bronnikov wrote:
>> From: Sergey Bronnikov <sergeyb@tarantool.org>
>>
>> LuaJIT has a macro LUAJIT_DISABLE_SYSPROF that disable
>
>Typo: s/disable/disables/
Fixed.
>
>> sysprof support. Sysprof tests doesn't respect this macro
>
>Typo: s/doesn't/don't/
>Typo: s/macro/macro,/
Fixed.
>
>> and therefore some of them failed when macro is enabled.
>
>Typo: /macro/macro,/
Fixed as /macro/the macro/.
>
>>
>> The proposed patch:
>
>This isn't proposed patch, but it is just patch, so:
>s/proposed //
>
>>
>> - skip sysprof testcases in a suite tarantool-c-tests
>
>Typo: /skip/Skips/
>Missed dot at the end of the sentence.
Fixed.
>
>> - introduce an environment variable LUAJIT_DISABLE_SYSPROF in
>
>Typo: s/introduce/Introduces/
Fixed.
>
>> a suite tarantool-tests that set to 1 when sysprof support is
>
>Typo: s/set/is set/
Fixed.
>
>> disabled
>
>Missed dot at the end of the sentence.
Fixed.
>
>> - propagate a status of sysprof support to Lua tests and skip
>
>Typo: s/propagate/Propagates
Fixed.
>
>> testing when sysprof is disabled
>
>Missed dot at the end of the sentence.
Fixed.
>
>> ---
>> test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c | 4 ++++
>> test/tarantool-c-tests/misclib-sysprof-capi.test.c | 4 ++++
>> test/tarantool-tests/CMakeLists.txt | 4 ++++
>> test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua | 2 ++
>> .../profilers/gh-5813-resolving-of-c-symbols.test.lua | 2 ++
>> .../gh-7264-add-proto-trace-sysprof-default.test.lua | 2 ++
>> .../profilers/gh-9217-profile-parsers-error-handling.test.lua | 2 ++
>> test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua | 2 ++
>> 8 files changed, 22 insertions(+)
>>
>> diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
>> index a8de3358..de4fb2c4 100644
>> --- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
>> +++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
>> @@ -277,8 +277,12 @@ static int test_tostring_call(void *ctx)
>>
>> int main(void)
>> {
>> +#if LUAJIT_DISABLE_SYSPROF
>> + return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
>
>Minor: I suppose we can drop the LUAJIT_DISABLE_SYSPROF mentioning since
>it becomes "maslo maslyanoe", for my taste.
>Feel free to ignore.
the intention was to describe a reason explicitly.
Update skip message:
diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
index de4fb2c4..a83a0921 100644
--- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
+++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
@@ -278,7 +278,7 @@ static int test_tostring_call(void *ctx)
int main(void)
{
#if LUAJIT_DISABLE_SYSPROF
- return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
+ return skip_all("Sysprof is disabled");
#else /* LUAJIT_DISABLE_SYSPROF */
const struct test_unit tgroup[] = {
test_unit_def(test_tostring_call),
diff --git a/test/tarantool-c-tests/misclib-sysprof-capi.test.c b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
index ec3354cc..21e40d22 100644
--- a/test/tarantool-c-tests/misclib-sysprof-capi.test.c
+++ b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
@@ -302,7 +302,7 @@ static int profile_func_jiton(void *test_state)
int main(void)
{
#if LUAJIT_DISABLE_SYSPROF
- return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
+ return skip_all("Sysprof is disabled");
#else /* LUAJIT_DISABLE_SYSPROF */
if (LUAJIT_OS != LUAJIT_OS_LINUX)
return skip_all("Sysprof is implemented for Linux only");
diff --git a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
index 379ccf8e..e3cb86c0 100644
--- a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
+++ b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
@@ -1,5 +1,4 @@
local tap = require('tap')
-local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
jit.arch ~= 'x64',
@@ -8,7 +7,7 @@ local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
['No profile tools CLI option integration'] = _TARANTOOL,
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
- ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
+ ['Sysprof is disabled'] = os.getenv('LUAJIT_DISABLE_SYSPROF'),
})
test:plan(3)
diff --git a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
index ff745225..4af1cf79 100644
--- a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
+++ b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
@@ -1,12 +1,11 @@
local tap = require("tap")
-local no_sysprof = os.getenv("LUAJIT_DISABLE_SYSPROF")
local test = tap.test("gh-5813-resolving-of-c-symbols"):skipcond({
["Memprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
jit.arch ~= "x64",
["Memprof is implemented for Linux only"] = jit.os ~= "Linux",
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
- ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
+ ["Sysprof is disabled"] = os.getenv("LUAJIT_DISABLE_SYSPROF")
})
test:plan(5)
diff --git a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
index e09016e7..0a909819 100644
--- a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
+++ b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
@@ -1,5 +1,4 @@
local tap = require('tap')
-local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
['Test requires JIT enabled'] = not jit.status(),
['Sysprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and
@@ -7,7 +6,7 @@ local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
['Sysprof is implemented for Linux only'] = jit.os ~= 'Linux',
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
- ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
+ ['Sysprof is disabled'] = os.getenv('LUAJIT_DISABLE_SYSPROF'),
})
test:plan(2)
diff --git a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
index 012b1501..68c1b726 100644
--- a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
+++ b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
@@ -1,5 +1,4 @@
local tap = require('tap')
-local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
jit.arch ~= 'x64',
@@ -8,7 +7,7 @@ local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
['No profile tools CLI option integration'] = _TARANTOOL,
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
- ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
+ ['Sysprof is disabled'] = os.getenv('LUAJIT_DISABLE_SYSPROF'),
})
jit.off()
diff --git a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
index ea5ca9a9..711ca646 100644
--- a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
+++ b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
@@ -1,12 +1,11 @@
local tap = require("tap")
-local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
local test = tap.test("misc-sysprof-lapi"):skipcond({
["Sysprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
jit.arch ~= "x64",
["Sysprof is implemented for Linux only"] = jit.os ~= "Linux",
-- See also https://github.com/LuaJIT/LuaJIT/issues/606.
["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
- ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
+ ["Sysprof is disabled"] = os.getenv('LUAJIT_DISABLE_SYSPROF'),
})
test:plan(19)
>> +#else /* LUAJIT_DISABLE_SYSPROF */
>
><snipped>
>
>> diff --git a/test/tarantool-c-tests/misclib-sysprof-capi.test.c b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
>> index 6f53d488..ec3354cc 100644
>> --- a/test/tarantool-c-tests/misclib-sysprof-capi.test.c
>> +++ b/test/tarantool-c-tests/misclib-sysprof-capi.test.c
>> @@ -301,6 +301,9 @@ static int profile_func_jiton(void *test_state)
>>
>> int main(void)
>> {
>> +#if LUAJIT_DISABLE_SYSPROF
>> + return skip_all("Sysprof is disabled (LUAJIT_DISABLE_SYSPROF)");
>
>Ditto.
>
>> +#else /* LUAJIT_DISABLE_SYSPROF */
>> if (LUAJIT_OS != LUAJIT_OS_LINUX)
>> return skip_all("Sysprof is implemented for Linux only");
>> if (LUAJIT_TARGET != LUAJIT_ARCH_X86
>> @@ -322,4 +325,5 @@ int main(void)
>> const int test_result = test_run_group(tgroup, L);
>> utils_lua_close(L);
>> return test_result;
>> +#endif /* LUAJIT_DISABLE_SYSPROF */
>> }
>> diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
>> index 8bdb2cf3..a6e39f6c 100644
>> --- a/test/tarantool-tests/CMakeLists.txt
>> +++ b/test/tarantool-tests/CMakeLists.txt
>> @@ -89,6 +89,10 @@ if(LUAJIT_ENABLE_TABLE_BUMP)
>> list(APPEND LUA_TEST_ENV_MORE LUAJIT_TABLE_BUMP=1)
>> endif()
>>
>> +if(LUAJIT_DISABLE_SYSPROF)
>> + list(APPEND LUA_TEST_ENV_MORE LUAJIT_DISABLE_SYSPROF=1)
>> +endif()
>> +
>> set(TEST_SUITE_NAME "tarantool-tests")
>>
>> # XXX: The call produces both test and target
>> diff --git a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
>> index f935dc5b..379ccf8e 100644
>> --- a/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
>> +++ b/test/tarantool-tests/profilers/gh-5688-tool-cli-flag.test.lua
>> @@ -1,4 +1,5 @@
>> local tap = require('tap')
>> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
>> local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
>> ['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
>> jit.arch ~= 'x64',
>> @@ -7,6 +8,7 @@ local test = tap.test('gh-5688-tool-cli-flag'):skipcond({
>> ['No profile tools CLI option integration'] = _TARANTOOL,
>> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
>> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
>> + ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
>
>Minor: "disabled due to disable" sounds like "maslo maslyanoe" for my
>taste. I suppose "Sysprof is disabled" is just enough. As a minor bonus,
>we may avoid the declaration of the `no_sysprof` variable since we can
>just use one-line `os.getenv()` that fits into this line now.
>
>Same for the other Lua tests.
Updated.
>
>> })
>>
>> test:plan(3)
>> diff --git a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
>> index 74bcd9e8..ff745225 100644
>> --- a/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
>> +++ b/test/tarantool-tests/profilers/gh-5813-resolving-of-c-symbols.test.lua
>> @@ -1,10 +1,12 @@
>> local tap = require("tap")
>> +local no_sysprof = os.getenv("LUAJIT_DISABLE_SYSPROF")
>> local test = tap.test("gh-5813-resolving-of-c-symbols"):skipcond({
>> ["Memprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
>> jit.arch ~= "x64",
>> ["Memprof is implemented for Linux only"] = jit.os ~= "Linux",
>> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
>> ["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
>> + ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
>> })
>>
>> test:plan(5)
>> diff --git a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
>> index 176c1a15..e09016e7 100644
>> --- a/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
>> +++ b/test/tarantool-tests/profilers/gh-7264-add-proto-trace-sysprof-default.test.lua
>> @@ -1,4 +1,5 @@
>> local tap = require('tap')
>> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
>> local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
>> ['Test requires JIT enabled'] = not jit.status(),
>> ['Sysprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and
>> @@ -6,6 +7,7 @@ local test = tap.test('gh-7264-add-proto-trace-sysprof-default'):skipcond({
>> ['Sysprof is implemented for Linux only'] = jit.os ~= 'Linux',
>> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
>> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
>> + ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
>> })
>>
>> test:plan(2)
>> diff --git a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
>> index 65c51198..012b1501 100644
>> --- a/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
>> +++ b/test/tarantool-tests/profilers/gh-9217-profile-parsers-error-handling.test.lua
>> @@ -1,4 +1,5 @@
>> local tap = require('tap')
>> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
>> local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
>> ['Profile tools are implemented for x86_64 only'] = jit.arch ~= 'x86' and
>> jit.arch ~= 'x64',
>> @@ -7,6 +8,7 @@ local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({
>> ['No profile tools CLI option integration'] = _TARANTOOL,
>> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
>> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
>> + ['Disabled due to LUAJIT_DISABLE_SYSPROF'] = no_sysprof,
>> })
>>
>> jit.off()
>> diff --git a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
>> index 26c277cd..ea5ca9a9 100644
>> --- a/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
>> +++ b/test/tarantool-tests/profilers/misclib-sysprof-lapi.test.lua
>> @@ -1,10 +1,12 @@
>> local tap = require("tap")
>> +local no_sysprof = os.getenv('LUAJIT_DISABLE_SYSPROF')
>> local test = tap.test("misc-sysprof-lapi"):skipcond({
>> ["Sysprof is implemented for x86_64 only"] = jit.arch ~= "x86" and
>> jit.arch ~= "x64",
>> ["Sysprof is implemented for Linux only"] = jit.os ~= "Linux",
>> -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
>> ["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
>> + ["Disabled due to LUAJIT_DISABLE_SYSPROF"] = no_sysprof,
>> })
>>
>> test:plan(19)
>> --
>> 2.34.1
>>
>
>--
>Best regards,
>Sergey Kaplun
--
sergeyb@
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash Sergey Bronnikov via Tarantool-patches
2024-12-06 7:55 ` Sergey Kaplun via Tarantool-patches
@ 2024-12-11 12:24 ` Maxim Kokryashkin via Tarantool-patches
1 sibling, 0 replies; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2024-12-11 12:24 UTC (permalink / raw)
To: Sergey Bronnikov; +Cc: tarantool-patches
Hi, Sergey!
Thanks for the patch!
LGTM as trivial
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF Sergey Bronnikov via Tarantool-patches
2024-12-06 8:08 ` Sergey Kaplun via Tarantool-patches
@ 2024-12-11 12:25 ` Maxim Kokryashkin via Tarantool-patches
1 sibling, 0 replies; 10+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2024-12-11 12:25 UTC (permalink / raw)
To: Sergey Bronnikov; +Cc: tarantool-patches
Hi, Sergey!
Thanks for the patch!
LGTM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests
2024-12-06 7:05 [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Bronnikov via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash Sergey Bronnikov via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF Sergey Bronnikov via Tarantool-patches
@ 2024-12-17 12:23 ` Sergey Kaplun via Tarantool-patches
2 siblings, 0 replies; 10+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2024-12-17 12:23 UTC (permalink / raw)
To: Sergey Bronnikov; +Cc: tarantool-patches
Sergey,
I've applied the patch-set into all long-term branches in
tarantool/luajit and bumped a new version in master [1],
release/3.3 [2], release/3.2 [3] and release/2.11 [4].
[1]: https://github.com/tarantool/tarantool/pull/10936
[2]: https://github.com/tarantool/tarantool/pull/10937
[3]: https://github.com/tarantool/tarantool/pull/10938
[4]: https://github.com/tarantool/tarantool/pull/10939
--
Best regards,
Sergey Kaplun
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-12-17 12:24 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-06 7:05 [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Bronnikov via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 1/2] test: small fixes in gh-8594-sysprof-ffunc-crash Sergey Bronnikov via Tarantool-patches
2024-12-06 7:55 ` Sergey Kaplun via Tarantool-patches
2024-12-06 10:16 ` Sergey Bronnikov via Tarantool-patches
2024-12-11 12:24 ` Maxim Kokryashkin via Tarantool-patches
2024-12-06 7:06 ` [Tarantool-patches] [PATCH luajit 2/2] test: skip sysprof tests with LUAJIT_DISABLE_SYSPROF Sergey Bronnikov via Tarantool-patches
2024-12-06 8:08 ` Sergey Kaplun via Tarantool-patches
2024-12-06 10:31 ` Sergey Bronnikov via Tarantool-patches
2024-12-11 12:25 ` Maxim Kokryashkin via Tarantool-patches
2024-12-17 12:23 ` [Tarantool-patches] [PATCH luajit 0/2] Respect LUAJIT_DISABLE_SYSPROF in sysprof tests Sergey Kaplun 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