Skip to content

Update Catch2 and simplify concurrent test assertions #5558

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

Open
Nicolas Pedernera (Nicolas-Pedernera) wants to merge 5 commits into
base: main
Choose a base branch
from
+7 −20
Open

Update Catch2 and simplify concurrent test assertions #5558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b660096
Update Catch2 and simplify concurrent test assertions
Nicolas-Pedernera Sep 8, 2026
5254f6a
Merge branch 'main' into fix/catch2-multithreading
Nicolas-Pedernera Sep 8, 2026
876bfa7
Bump Catch2 to v3.11.0 and use stable CATCH_CONFIG_THREAD_SAFE_ASSERT…
Nicolas-Pedernera Sep 15, 2026
4c7ed0d
Remove stray patch file from repo
Nicolas-Pedernera Sep 15, 2026
79b1e8e
Fix Catch2 submodule pointer to actually point at v3.11.0
Nicolas-Pedernera Sep 15, 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
2 changes: 1 addition & 1 deletion external/Catch2
Open in desktop
Submodule Catch2 updated 125 files
2 changes: 1 addition & 1 deletion scripts/initialize_ebpf_repo.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ $nugetRestoreCommand = if ($msbuildDir) {
$commands = @(
"git submodule update --init --recursive",
"cmake $cmakeCommonArgs -S external\ebpf-verifier -B external\ebpf-verifier\build -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<CONFIG:FuzzerDebug>:Debug>",
"cmake $cmakeCommonArgs -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<CONFIG:FuzzerDebug>:Debug>",
"cmake $cmakeCommonArgs -S external\catch2 -B external\catch2\build -DBUILD_TESTING=OFF -DCATCH_CONFIG_THREAD_SAFE_ASSERTIONS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<CONFIG:FuzzerDebug>:Debug>",
"cmake $cmakeCommonArgs -S external\ubpf -B external\ubpf\build -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<CONFIG:FuzzerDebug>:Debug>",
"cmake $cmakeCommonArgs -S external\ubpf -B external\ubpf\build_fuzzer -DUBPF_ENABLE_LIBFUZZER=on",
$nugetRestoreCommand
Expand Down
23 changes: 5 additions & 18 deletions tests/netebpfext_unit/netebpfext_unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,7 @@ sock_addr_thread_function(
_In_ fwp_classify_parameters_t* parameters,
sock_addr_test_type_t type,
uint16_t start_port,
uint16_t end_port,
std::atomic<size_t>* failure_count)
uint16_t end_port)
{
FWP_ACTION_TYPE result;
uint16_t port_number;
Expand Down Expand Up @@ -917,7 +916,7 @@ sock_addr_thread_function(
continue;
}

(*failure_count)++;
CHECK(result == expected_result);
break;
}
}
Expand All @@ -933,7 +932,6 @@ TEST_CASE("sock_addr_invoke_concurrent1", "[netebpfext_concurrent]")
test_sock_addr_client_context_header_t client_context_header = {0};
test_sock_addr_client_context_t* client_context = &client_context_header.context;
fwp_classify_parameters_t parameters = {};
std::atomic<size_t> failure_count = 0;

// Declare helper before threads to ensure threads are joined before helper is destroyed.
// This prevents use-after-free when fault injection causes early test exit.
Expand All @@ -958,8 +956,7 @@ TEST_CASE("sock_addr_invoke_concurrent1", "[netebpfext_concurrent]")
&parameters,
SOCK_ADDR_TEST_TYPE_CONNECT,
parameters.destination_port,
parameters.destination_port,
&failure_count);
parameters.destination_port);
}

// Wait for 10 seconds.
Expand All @@ -974,8 +971,6 @@ TEST_CASE("sock_addr_invoke_concurrent1", "[netebpfext_concurrent]")
for (auto& thread : threads) {
thread.join();
}

REQUIRE(failure_count == 0);
}

// Invoke SOCK_ADDR_CONNECT concurrently with different classify parameters.
Expand All @@ -989,7 +984,6 @@ TEST_CASE("sock_addr_invoke_concurrent2", "[netebpfext_concurrent]")
BPF_CGROUP_INET4_CONNECT, BPF_CGROUP_INET6_CONNECT, BPF_CGROUP_INET4_RECV_ACCEPT, BPF_CGROUP_INET6_RECV_ACCEPT};
test_sock_addr_client_context_t* client_context = &client_context_header.context;
std::vector<fwp_classify_parameters_t> parameters;
std::atomic<size_t> failure_count = 0;

// Declare helper before threads to ensure threads are joined before helper is destroyed.
// This prevents use-after-free when fault injection causes early test exit.
Expand All @@ -1014,8 +1008,7 @@ TEST_CASE("sock_addr_invoke_concurrent2", "[netebpfext_concurrent]")
&parameters[i],
SOCK_ADDR_TEST_TYPE_CONNECT,
(uint16_t)(i * 1000),
(uint16_t)(i * 1000 + 1000),
&failure_count);
(uint16_t)(i * 1000 + 1000));
}

// Wait for 10 seconds.
Expand All @@ -1030,8 +1023,6 @@ TEST_CASE("sock_addr_invoke_concurrent2", "[netebpfext_concurrent]")
for (auto& thread : threads) {
thread.join();
}

REQUIRE(failure_count == 0);
}

// Invoke SOCK_ADDR_RECV_ACCEPT concurrently with different classify parameters.
Expand All @@ -1043,7 +1034,6 @@ TEST_CASE("sock_addr_invoke_concurrent3", "[netebpfext_concurrent]")
test_sock_addr_client_context_header_t client_context_header = {0};
test_sock_addr_client_context_t* client_context = &client_context_header.context;
std::vector<fwp_classify_parameters_t> parameters;
std::atomic<size_t> failure_count = 0;

// Declare helper before threads to ensure threads are joined before helper is destroyed.
// This prevents use-after-free when fault injection causes early test exit.
Expand All @@ -1068,8 +1058,7 @@ TEST_CASE("sock_addr_invoke_concurrent3", "[netebpfext_concurrent]")
&parameters[i],
SOCK_ADDR_TEST_TYPE_RECV_ACCEPT,
(uint16_t)(i * 1000),
(uint16_t)(i * 1000 + 1000),
&failure_count);
(uint16_t)(i * 1000 + 1000));
}

// Wait for 10 seconds.
Expand All @@ -1084,8 +1073,6 @@ TEST_CASE("sock_addr_invoke_concurrent3", "[netebpfext_concurrent]")
for (auto& thread : threads) {
thread.join();
}

REQUIRE(failure_count == 0);
}

TEST_CASE("sock_addr_context", "[netebpfext]")
Expand Down