From c3340e7c0877ab4435ac7f8203d477ddb3cba68c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 5 Nov 2020 12:44:21 +0800 Subject: [PATCH] test/crimson: do not support variadic future also add "unittest-seastar-errorator" to unit test. this should address the build failure introduced by 688b95798bfd88b409abce9b70bb6d2933819bef Signed-off-by: Kefu Chai --- src/test/crimson/CMakeLists.txt | 2 +- src/test/crimson/test_errorator.cc | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/test/crimson/CMakeLists.txt b/src/test/crimson/CMakeLists.txt index 5d2caa1191098..db1ed85d8adde 100644 --- a/src/test/crimson/CMakeLists.txt +++ b/src/test/crimson/CMakeLists.txt @@ -77,4 +77,4 @@ add_executable(unittest-seastar-errorator target_link_libraries( unittest-seastar-errorator crimson::gtest) - +add_ceph_unittest(unittest-seastar-errorator) diff --git a/src/test/crimson/test_errorator.cc b/src/test/crimson/test_errorator.cc index 08f053725be63..3d5c3567b8eb2 100644 --- a/src/test/crimson/test_errorator.cc +++ b/src/test/crimson/test_errorator.cc @@ -8,10 +8,8 @@ struct do_until_test_t : public seastar_test_suite_t { using ertr = crimson::errorator; - template - using future = ertr::future; - future<> test() { - return crimson::do_until([this]() -> future { + ertr::future<> test() { + return crimson::do_until([this] { if (i < 5) { ++i; return ertr::make_ready_future(false); -- 2.39.5