From 27c3fc2c4a31b5b75e0b40663e963940d265a4a7 Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Thu, 19 May 2022 07:47:09 -0500 Subject: [PATCH] Fixing Windows builder, building docs on CircleCI --- .circleci/config.yml | 2 +- libs/core/resource_partitioner/examples/async_customization.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e85d73717870..43e8648e55d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,7 +211,7 @@ jobs: cmake --version if [ -z "$CIRCLE_PR_NUMBER" ] && \ ( [ "$CIRCLE_BRANCH" == "master" ] || \ - [ "$CIRCLE_BRANCH" =~ "^release." ] || \ + [[ "$CIRCLE_BRANCH" =~ ^release.* ]] || \ [ -n "$CIRCLE_TAG" ] ); then DOCUMENTATION_OUTPUT_FORMATS="html;singlehtml;latexpdf" else diff --git a/libs/core/resource_partitioner/examples/async_customization.cpp b/libs/core/resource_partitioner/examples/async_customization.cpp index 4297a5485d7e..4a2d9cd774f8 100644 --- a/libs/core/resource_partitioner/examples/async_customization.cpp +++ b/libs/core/resource_partitioner/examples/async_customization.cpp @@ -313,6 +313,7 @@ int test(const std::string& message, Executor& exec) HPX_TEST_EQ(fts.get(), "then(shared)"); std::cout << std::endl; +#if !defined(HPX_MSVC) // test 3a std::cout << "============================" << std::endl; std::cout << "Test 3a : when_all()" << std::endl; @@ -367,6 +368,7 @@ int test(const std::string& message, Executor& exec) }); HPX_TEST_EQ(fws.get(), "when_all(shared)"); std::cout << std::endl; +#endif // test 4a std::cout << "============================" << std::endl;