From 0e2334f3751d126c70a29b1c45e2b42a8ec16ad2 Mon Sep 17 00:00:00 2001 From: alexey bashtanov Date: Wed, 26 Jun 2024 11:01:54 +0100 Subject: [PATCH] tests/ssx/single_sharded: fix -c1 and correct test file name --- src/v/ssx/tests/CMakeLists.txt | 2 +- src/v/ssx/tests/{single_sharded.cc => single_sharded_test.cc} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/v/ssx/tests/{single_sharded.cc => single_sharded_test.cc} (98%) diff --git a/src/v/ssx/tests/CMakeLists.txt b/src/v/ssx/tests/CMakeLists.txt index f233f4e278cd2..ce8d0f6d2829f 100644 --- a/src/v/ssx/tests/CMakeLists.txt +++ b/src/v/ssx/tests/CMakeLists.txt @@ -32,7 +32,7 @@ rp_test( SOURCES abort_source_test.cc sharded_ptr_test.cc - single_sharded.cc + single_sharded_test.cc LIBRARIES v::seastar_testing_main ARGS "-- -c 2" LABELS ssx diff --git a/src/v/ssx/tests/single_sharded.cc b/src/v/ssx/tests/single_sharded_test.cc similarity index 98% rename from src/v/ssx/tests/single_sharded.cc rename to src/v/ssx/tests/single_sharded_test.cc index 60e3a3aa4e9d4..0873504352ff7 100644 --- a/src/v/ssx/tests/single_sharded.cc +++ b/src/v/ssx/tests/single_sharded_test.cc @@ -80,7 +80,7 @@ struct caller { SEASTAR_THREAD_TEST_CASE(single_sharded) { ss::shard_id the_shard = ss::smp::count - 1; - ss::shard_id wrong_shard = std::max(ss::shard_id{0}, the_shard - 1); + ss::shard_id wrong_shard = ss::smp::count == 1 ? 0 : the_shard - 1; ss::sharded counters; ssx::single_sharded single;