From d6fc34a7d85b63d98bdb9c7b3ccc8895ab6ed1c2 Mon Sep 17 00:00:00 2001
From: Petr Shumilov
Date: Wed, 21 Jan 2026 16:54:04 +0300
Subject: [PATCH 1/2] Disable an aborting of hanging tasks for k2 functional
tests
Signed-off-by: Petr Shumilov
---
tests/kphp_ci_pipeline_runner.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/kphp_ci_pipeline_runner.py b/tests/kphp_ci_pipeline_runner.py
index 5b1d4d9912..eedd31aa64 100755
--- a/tests/kphp_ci_pipeline_runner.py
+++ b/tests/kphp_ci_pipeline_runner.py
@@ -427,7 +427,7 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
runner.add_test_group(
name="k2-functional-tests",
description="run k2-kphp functional tests with cxx={}".format(args.cxx_name),
- cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} KPHP_CXX={cxx_name} K2_BIN={k2_bin} python3 -m pytest --basetemp={base_tempdir} --tb=native -n{jobs} {functional_tests_dir}".format(
+ cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} KPHP_CXX={cxx_name} K2_BIN={k2_bin} K2_MONITORING_ABORT_HANGING_GLOBAL_TASK=false K2_MONITORING_ABORT_HANGING_REQUEST_TASK=false python3 -m pytest --basetemp={base_tempdir} --tb=native -n{jobs} {functional_tests_dir}".format(
kphp_polyfills_repo=kphp_polyfills_repo,
cxx_name=args.cxx_name,
k2_bin=args.k2_bin,
From cb6f63ef599f7544f269c64a685bc72c9c5eb5c5 Mon Sep 17 00:00:00 2001
From: Petr Shumilov
Date: Wed, 21 Jan 2026 17:43:09 +0300
Subject: [PATCH 2/2] Fix typo
Signed-off-by: Petr Shumilov
---
.../inter-component-session/details/function-wrapper.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/runtime-light/stdlib/component/inter-component-session/details/function-wrapper.h b/runtime-light/stdlib/component/inter-component-session/details/function-wrapper.h
index 1a06f623ea..fb3dc4f820 100644
--- a/runtime-light/stdlib/component/inter-component-session/details/function-wrapper.h
+++ b/runtime-light/stdlib/component/inter-component-session/details/function-wrapper.h
@@ -60,7 +60,7 @@ class function_wrapper final {
template
R operator()(Arguments&&... args) noexcept {
- static_assert(std::is_invocable_v);
+ static_assert(std::is_invocable_v);
kphp::log::assertion(func_obj != nullptr);
return invoker(func_obj, std::forward(args...));
}
@@ -101,7 +101,7 @@ class function_wrapper final {
std::unique_ptr raw_mem;
const void* func_obj;
R (*invoker)(const void*, Args...);
- using ivoker_type = R (*)(Args...);
+ using invoker_type = R (*)(Args...);
void (*deleter)(const void*);
};