Skip to content

[k2]: make k2 CI green again #1509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PetrShumilov merged 2 commits into from
Jan 21, 2026
Merged

[k2]: make k2 CI green again #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6fc34a
Disable an aborting of hanging tasks for k2 functional tests
PetrShumilov Jan 21, 2026
cb6f63e
Fix typo
PetrShumilov Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime-light/stdlib/component/inter-component-session/details/function-wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class function_wrapper final {

template<typename... Arguments>
R operator()(Arguments&&... args) noexcept {
static_assert(std::is_invocable_v<ivoker_type, Arguments...>);
static_assert(std::is_invocable_v<invoker_type, Arguments...>);
kphp::log::assertion(func_obj != nullptr);
return invoker(func_obj, std::forward<Arguments...>(args...));
}
Expand Down Expand Up @@ -101,7 +101,7 @@ class function_wrapper final {
std::unique_ptr<void, decltype(std::addressof(raw_mem_free))> 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*);
};

Expand Down
2 changes: 1 addition & 1 deletion tests/kphp_ci_pipeline_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading