NVIDIA · ericniebler · Apr 12, 2026 · Apr 12, 2026 · Apr 12, 2026 · Apr 12, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,14 +121,15 @@ rapids_cpm_init(OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/versions.json)
 
 if (STDEXEC_BUILD_TESTS)
     # Add Catch2
-    set(Catch2_VERSION 2.13.6)
+    set(Catch2_VERSION 3.14.0)
     # Always download it, don't attempt to do `find_package(Catch2)` first
     set(CPM_DOWNLOAD_Catch2 TRUE)
     rapids_cpm_find(Catch2 ${Catch2_VERSION}
-      GLOBAL_TARGETS Catch2::Catch2
+      GLOBAL_TARGETS Catch2::Catch2WithMain
       BUILD_EXPORT_SET stdexec-exports
       CPM_ARGS
         URL https://github.com/catchorg/Catch2/archive/refs/tags/v${Catch2_VERSION}.zip
+        OPTIONS "CMAKE_CXX_STANDARD 20"
     )
 endif()
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -92,7 +92,10 @@ set_target_properties(common_test_settings PROPERTIES
     MSVC_DEBUG_INFORMATION_FORMAT Embedded
     )
 target_include_directories(common_test_settings INTERFACE "${CMAKE_CURRENT_LIST_DIR}")
-target_compile_definitions(common_test_settings INTERFACE STDEXEC_NAMESPACE=std::execution)
+target_compile_definitions(common_test_settings INTERFACE
+    STDEXEC_NAMESPACE=std::execution
+    $<$<PLATFORM_ID:Windows>:NOMINMAX>
+    )
 target_compile_options(common_test_settings INTERFACE
     $<$<CXX_COMPILER_ID:MSVC>:/wd4714> # function marked as __forceinline not inlined
     $<$<CXX_COMPILER_ID:GNU>:-Wno-maybe-uninitialized> # warnings being emitted from stdlib headers, why?
@@ -108,7 +111,7 @@ target_link_libraries(test.stdexec
     PUBLIC
     STDEXEC::stdexec
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
@@ -122,7 +125,7 @@ if(STDEXEC_BUILD_PARALLEL_SCHEDULER)
       STDEXEC::stdexec
       STDEXEC::parallel_scheduler
       stdexec_executable_flags
-      Catch2::Catch2
+      Catch2::Catch2WithMain
       PRIVATE
       common_test_settings)
 endif()
@@ -134,12 +137,12 @@ target_link_libraries(test.scratch
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::tbbexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
 # Discover the Catch2 test built by the application
-include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake)
+include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
 
 # For testing that builds fail as expected
 include(${icm_SOURCE_DIR}/icm_build_failure_testing.cmake)

diff --git a/test/exec/CMakeLists.txt b/test/exec/CMakeLists.txt
@@ -73,7 +73,7 @@ target_link_libraries(test.exec
     PUBLIC
     STDEXEC::stdexec
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 

diff --git a/test/exec/asio/CMakeLists.txt b/test/exec/asio/CMakeLists.txt
@@ -27,7 +27,7 @@ target_link_libraries(test.asioexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::asioexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 

diff --git a/test/exec/asio/test_asio_thread_pool.cpp b/test/exec/asio/test_asio_thread_pool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <numeric>
 #include <span>

diff --git a/test/exec/asio/test_completion_token.cpp b/test/exec/asio/test_completion_token.cpp
@@ -19,7 +19,7 @@
 #include <exec/asio/asio_config.hpp>
 #include <exec/asio/completion_token.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <barrier>
 #include <concepts>
@@ -391,7 +391,7 @@ namespace
             "completion handler's lifetime (this is necessary in situations where "
             "asynchronous control flow bifurcates and one of the child operations ends "
             "via exception)",
-            "[asioexec][completion_token]")
+            "[asioexec][completion_token][!mayfail]")
   {
     std::exception_ptr    ex;
     std::shared_ptr<void> ptr;

diff --git a/test/exec/asio/test_use_sender.cpp b/test/exec/asio/test_use_sender.cpp
@@ -22,7 +22,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <chrono>
 #include <exception>

diff --git a/test/exec/async_scope/test_dtor.cpp b/test/exec/async_scope/test_dtor.cpp
@@ -1,5 +1,5 @@
 #include "exec/static_thread_pool.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;

diff --git a/test/exec/async_scope/test_empty.cpp b/test/exec/async_scope/test_empty.cpp
@@ -1,6 +1,6 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;

diff --git a/test/exec/async_scope/test_spawn.cpp b/test/exec/async_scope/test_spawn.cpp
@@ -1,7 +1,7 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
 #include "test_common/type_helpers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;

diff --git a/test/exec/async_scope/test_spawn_future.cpp b/test/exec/async_scope/test_spawn_future.cpp
@@ -1,6 +1,6 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/just_from.hpp>
 #include <exec/static_thread_pool.hpp>

diff --git a/test/exec/async_scope/test_start_now.cpp b/test/exec/async_scope/test_start_now.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/start_now.hpp>
 #include <exec/static_thread_pool.hpp>

diff --git a/test/exec/async_scope/test_stop.cpp b/test/exec/async_scope/test_stop.cpp
@@ -2,7 +2,7 @@
 #include "exec/start_detached.hpp"
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;

diff --git a/test/exec/sequence/test_any_sequence_of.cpp b/test/exec/sequence/test_any_sequence_of.cpp
@@ -18,7 +18,7 @@
 #include "exec/sequence/any_sequence_of.hpp"
 #include "exec/sequence/empty_sequence.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_GNU("-Wunused-function")

diff --git a/test/exec/sequence/test_empty_sequence.cpp b/test/exec/sequence/test_empty_sequence.cpp
@@ -17,7 +17,7 @@
 
 #include "exec/sequence/empty_sequence.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;

diff --git a/test/exec/sequence/test_ignore_all_values.cpp b/test/exec/sequence/test_ignore_all_values.cpp
@@ -18,7 +18,7 @@
 #include "exec/sequence/empty_sequence.hpp"
 #include "exec/sequence/ignore_all_values.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {

diff --git a/test/exec/sequence/test_iterate.cpp b/test/exec/sequence/test_iterate.cpp
@@ -21,7 +21,7 @@
 #if !STDEXEC_NO_STDCPP_RANGES()
 
 #  include <array>
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 #  include <numeric>
 
 namespace

diff --git a/test/exec/sequence/test_merge.cpp b/test/exec/sequence/test_merge.cpp
@@ -31,7 +31,7 @@
 #include "stdexec/__detail/__meta.hpp"
 #include "stdexec/__detail/__upon_error.hpp"
 #include <atomic>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <mutex>
 #include <test_common/receivers.hpp>

diff --git a/test/exec/sequence/test_transform_each.cpp b/test/exec/sequence/test_transform_each.cpp
@@ -21,7 +21,7 @@
 #include "exec/sequence/empty_sequence.hpp"
 #include "exec/sequence/ignore_all_values.hpp"
 #include "exec/sequence/iterate.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>

diff --git a/test/exec/taskflow/CMakeLists.txt b/test/exec/taskflow/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(test.taskflowexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::taskflowexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 

diff --git a/test/exec/taskflow/test_taskflow_thread_pool.cpp b/test/exec/taskflow/test_taskflow_thread_pool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <stdexec/execution.hpp>
 

diff --git a/test/exec/tbb/CMakeLists.txt b/test/exec/tbb/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(test.tbbexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::tbbexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 

diff --git a/test/exec/tbb/test_tbb_thread_pool.cpp b/test/exec/tbb/test_tbb_thread_pool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <span>
 

diff --git a/test/exec/test_any_sender.cpp b/test/exec/test_any_sender.cpp
@@ -25,7 +25,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <iostream>
 

diff --git a/test/exec/test_at_coroutine_exit.cpp b/test/exec/test_at_coroutine_exit.cpp
@@ -18,7 +18,7 @@
 #include <stdexec/coroutine.hpp>
 
 #if !STDEXEC_NO_STDCPP_COROUTINES() && !STDEXEC_NO_STDCPP_EXCEPTIONS()
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 #  include <exec/at_coroutine_exit.hpp>
 #  include <exec/on_coro_disposition.hpp>
 

diff --git a/test/exec/test_bwos_lifo_queue.cpp b/test/exec/test_bwos_lifo_queue.cpp
@@ -22,7 +22,7 @@
 #include <thread>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 TEST_CASE("exec::bwos::lifo_queue - ", "[bwos]")
 {

diff --git a/test/exec/test_completion_signatures.cpp b/test/exec/test_completion_signatures.cpp
@@ -24,7 +24,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;

diff --git a/test/exec/test_cpo_ensure_started.cpp b/test/exec/test_cpo_ensure_started.cpp
@@ -19,7 +19,7 @@
 #include "../stdexec/cpos/cpo_helpers.cuh"
 #include "../test_common/receivers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {

diff --git a/test/exec/test_cpo_split.cpp b/test/exec/test_cpo_split.cpp
@@ -19,7 +19,7 @@
 #include "../stdexec/cpos/cpo_helpers.cuh"
 #include "../test_common/receivers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {

diff --git a/test/exec/test_create.cpp b/test/exec/test_create.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/create.hpp>
 #include <exec/static_thread_pool.hpp>

diff --git a/test/exec/test_ensure_started.cpp b/test/exec/test_ensure_started.cpp
@@ -23,7 +23,7 @@
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;

diff --git a/test/exec/test_env.cpp b/test/exec/test_env.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <stdexec/execution.hpp>
 

diff --git a/test/exec/test_execute.cpp b/test/exec/test_execute.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <atomic>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/execute.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>

diff --git a/test/exec/test_fork_join.cpp b/test/exec/test_fork_join.cpp
@@ -20,7 +20,7 @@
 #include "test_common/schedulers.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <atomic>
 

diff --git a/test/exec/test_into_tuple.cpp b/test/exec/test_into_tuple.cpp
@@ -18,7 +18,7 @@
 #include "test_common/senders.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 

diff --git a/test/exec/test_io_uring_context.cpp b/test/exec/test_io_uring_context.cpp
@@ -28,7 +28,7 @@
 #  include "exec/start_detached.hpp"
 #  include "exec/when_any.hpp"
 
-#  include "catch2/catch.hpp"
+#  include "catch2/catch_all.hpp"
 
 using namespace STDEXEC;
 using namespace exec;

diff --git a/test/exec/test_just_from.cpp b/test/exec/test_just_from.cpp
@@ -18,7 +18,7 @@
 #include "test_common/tuple.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 TEST_CASE("just_from is a sender", "[just_from]")
 {

diff --git a/test/exec/test_libdispatch.cpp b/test/exec/test_libdispatch.cpp
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "exec/libdispatch_queue.hpp"
 #include "stdexec/execution.hpp"
 
+#include <numeric>
+#include <utility>
+#include <vector>
+
 namespace
 {
   TEST_CASE("libdispatch queue should be able to process tasks")