Skip to content

Commit 8c989c9

Browse files
mvandebergmvandeberg
committed
Fix Drone CI: capy cloning, build warnings, and cmake-mainproject install
- Clone capy in drone.sh/drone.bat; disable coverage in .drone.star - Suppress GCC 14 false-positive -Wmaybe-uninitialized in destroy() - Exclude tls_stream_stress from non-TLS builds (CMake filter + separate per-backend B2 targets to avoid <build>no propagation) - Use BOOST_INCLUDE_LIBRARIES in cmake_test for cmake-subdirectory - Fix missing install target: guard on BOOST_COROSIO_IS_ROOT instead of boost_capy_FOUND (never set when capy comes from boost root subdirectory) - Scale test failsafes when running under valgrind
1 parent 4fc38ac commit 8c989c9

9 files changed

Lines changed: 132 additions & 73 deletions

File tree

‎.drone.star‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def main(ctx):
2929
],
3030
'>=20',
3131
docs=False,
32+
coverage=False,
3233
cache_dir='cache')
3334

3435
# macOS: generate() skips apple-clang when cxx_range='>=20' because

‎.drone/drone.bat‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ if "%BOOST_BRANCH%" == "" (
3434

3535
call ci\common_install.bat
3636

37+
REM Clone the capy dependency into the superproject.
38+
SET CAPY_BRANCH=develop
39+
SET CAPY_TARGET=!BOOST_CI_TARGET_BRANCH!
40+
if NOT "!DRONE_TARGET_BRANCH!" == "" SET CAPY_TARGET=!DRONE_TARGET_BRANCH!
41+
if "!CAPY_TARGET!" == "master" SET CAPY_BRANCH=master
42+
git clone -b !CAPY_BRANCH! https://github.com/cppalliance/capy.git !BOOST_ROOT!\libs\capy --depth 1
43+
3744
echo '==================================> COMPILE'
3845

3946
set B2_TARGETS=libs/!SELF!/test
@@ -55,6 +62,13 @@ SET BOOST_CI_SRC_FOLDER=%cd%
5562

5663
call ci\common_install.bat
5764

65+
REM Clone the capy dependency into the superproject.
66+
SET CAPY_BRANCH=develop
67+
SET CAPY_TARGET=!BOOST_CI_TARGET_BRANCH!
68+
if NOT "!DRONE_TARGET_BRANCH!" == "" SET CAPY_TARGET=!DRONE_TARGET_BRANCH!
69+
if "!CAPY_TARGET!" == "master" SET CAPY_BRANCH=master
70+
git clone -b !CAPY_BRANCH! https://github.com/cppalliance/capy.git !BOOST_ROOT!\libs\capy --depth 1
71+
5872
echo '==================================> COMPILE'
5973

6074
if "!CMAKE_NO_TESTS!" == "" (
@@ -124,6 +138,13 @@ SET BOOST_CI_SRC_FOLDER=%cd%
124138

125139
call ci\common_install.bat
126140

141+
REM Clone the capy dependency into the superproject.
142+
SET CAPY_BRANCH=develop
143+
SET CAPY_TARGET=!BOOST_CI_TARGET_BRANCH!
144+
if NOT "!DRONE_TARGET_BRANCH!" == "" SET CAPY_TARGET=!DRONE_TARGET_BRANCH!
145+
if "!CAPY_TARGET!" == "master" SET CAPY_BRANCH=master
146+
git clone -b !CAPY_BRANCH! https://github.com/cppalliance/capy.git !BOOST_ROOT!\libs\capy --depth 1
147+
127148
echo '==================================> COMPILE'
128149

129150
if "!CMAKE_NO_TESTS!" == "" (
@@ -160,6 +181,13 @@ SET BOOST_CI_SRC_FOLDER=%cd%
160181

161182
call ci\common_install.bat
162183

184+
REM Clone the capy dependency into the superproject.
185+
SET CAPY_BRANCH=develop
186+
SET CAPY_TARGET=!BOOST_CI_TARGET_BRANCH!
187+
if NOT "!DRONE_TARGET_BRANCH!" == "" SET CAPY_TARGET=!DRONE_TARGET_BRANCH!
188+
if "!CAPY_TARGET!" == "master" SET CAPY_BRANCH=master
189+
git clone -b !CAPY_BRANCH! https://github.com/cppalliance/capy.git !BOOST_ROOT!\libs\capy --depth 1
190+
163191
echo '==================================> COMPILE'
164192

165193
if "!CMAKE_NO_TESTS!" == "" (

‎.drone/drone.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ common_install () {
3434
export BOOST_CI_SRC_FOLDER=$(pwd)
3535

3636
. ./ci/common_install.sh
37+
38+
# Clone the capy dependency into the superproject.
39+
CAPY_BRANCH=develop
40+
CAPY_TARGET="${DRONE_TARGET_BRANCH:-$TRAVIS_BRANCH}"
41+
if [ "$CAPY_TARGET" = "master" ]; then
42+
CAPY_BRANCH=master
43+
fi
44+
git clone -b "$CAPY_BRANCH" https://github.com/cppalliance/capy.git "$BOOST_ROOT/libs/capy" --depth 1
3745
}
3846

3947
if [[ $(uname) == "Linux" && "$B2_ASAN" == "1" ]]; then

‎cmake/CorosioBuild.cmake‎

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# Resolve all build dependencies: sibling Boost libraries when inside a
1313
# boost tree, Capy via find_package / FetchContent, and Threads.
1414
#
15-
# Must be a macro so find_package results (e.g. boost_capy_FOUND) propagate
16-
# to the caller's scope for install logic.
15+
# Must be a macro so find_package results propagate to the caller's scope.
1716
macro(corosio_resolve_deps)
1817
# Sibling Boost libraries when building standalone inside a boost tree.
1918
# The Boost::asio reference must stay out of CMakeLists.txt because the
@@ -187,9 +186,8 @@ function(corosio_install)
187186
TARGETS ${_corosio_install_targets}
188187
VERSION ${BOOST_SUPERPROJECT_VERSION}
189188
HEADER_DIRECTORY include)
190-
elseif(boost_capy_FOUND)
189+
elseif(BOOST_COROSIO_IS_ROOT)
191190
include(GNUInstallDirs)
192-
include(CMakePackageConfigHelpers)
193191

194192
# Set INSTALL_INTERFACE for standalone installs (boost_install handles
195193
# this for superproject builds, including versioned-layout paths)
@@ -198,36 +196,52 @@ function(corosio_install)
198196
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
199197
endforeach()
200198

201-
set(BOOST_COROSIO_INSTALL_CMAKEDIR
202-
${CMAKE_INSTALL_LIBDIR}/cmake/boost_corosio)
203-
204-
install(TARGETS ${_corosio_install_targets}
205-
EXPORT boost_corosio-targets
206-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
207-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
208-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
209-
install(DIRECTORY include/
210-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
211-
install(EXPORT boost_corosio-targets
212-
NAMESPACE Boost::
213-
DESTINATION ${BOOST_COROSIO_INSTALL_CMAKEDIR})
214-
215-
configure_package_config_file(
216-
cmake/boost_corosio-config.cmake.in
217-
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config.cmake
218-
INSTALL_DESTINATION ${BOOST_COROSIO_INSTALL_CMAKEDIR})
219-
write_basic_package_version_file(
220-
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config-version.cmake
221-
COMPATIBILITY SameMajorVersion)
222-
223-
set(_corosio_config_files
224-
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config.cmake
225-
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config-version.cmake)
226-
if(WolfSSL_FOUND)
227-
list(APPEND _corosio_config_files
228-
${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindWolfSSL.cmake)
199+
if(boost_capy_FOUND)
200+
# Capy from find_package (imported target): full install with
201+
# CMake package config and export sets.
202+
include(CMakePackageConfigHelpers)
203+
204+
set(BOOST_COROSIO_INSTALL_CMAKEDIR
205+
${CMAKE_INSTALL_LIBDIR}/cmake/boost_corosio)
206+
207+
install(TARGETS ${_corosio_install_targets}
208+
EXPORT boost_corosio-targets
209+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
210+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
211+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
212+
install(DIRECTORY include/
213+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
214+
install(EXPORT boost_corosio-targets
215+
NAMESPACE Boost::
216+
DESTINATION ${BOOST_COROSIO_INSTALL_CMAKEDIR})
217+
218+
configure_package_config_file(
219+
cmake/boost_corosio-config.cmake.in
220+
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config.cmake
221+
INSTALL_DESTINATION ${BOOST_COROSIO_INSTALL_CMAKEDIR})
222+
write_basic_package_version_file(
223+
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config-version.cmake
224+
COMPATIBILITY SameMajorVersion)
225+
226+
set(_corosio_config_files
227+
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config.cmake
228+
${CMAKE_CURRENT_BINARY_DIR}/boost_corosio-config-version.cmake)
229+
if(WolfSSL_FOUND)
230+
list(APPEND _corosio_config_files
231+
${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindWolfSSL.cmake)
232+
endif()
233+
install(FILES ${_corosio_config_files}
234+
DESTINATION ${BOOST_COROSIO_INSTALL_CMAKEDIR})
235+
else()
236+
# Capy from source tree (boost root or FetchContent): export sets
237+
# can't work because capy isn't an imported target. Install the
238+
# library and headers only.
239+
install(TARGETS ${_corosio_install_targets}
240+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
241+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
242+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
243+
install(DIRECTORY include/
244+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
229245
endif()
230-
install(FILES ${_corosio_config_files}
231-
DESTINATION ${BOOST_COROSIO_INSTALL_CMAKEDIR})
232246
endif()
233247
endfunction()

‎include/boost/corosio/detail/timer_service.hpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,12 @@ waiter_node::completion_op::operator()()
760760
sched.work_finished();
761761
}
762762

763+
// GCC 14 false-positive: inlining ~optional<stop_callback> through
764+
// delete loses track that stop_cb_ was already .reset() above.
765+
#if defined(__GNUC__) && !defined(__clang__)
766+
#pragma GCC diagnostic push
767+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
768+
#endif
763769
inline void
764770
waiter_node::completion_op::destroy()
765771
{
@@ -783,6 +789,9 @@ waiter_node::completion_op::destroy()
783789
if (h)
784790
h.destroy();
785791
}
792+
#if defined(__GNUC__) && !defined(__clang__)
793+
#pragma GCC diagnostic pop
794+
#endif
786795

787796
inline std::coroutine_handle<>
788797
timer_service::implementation::wait(

‎test/cmake_test/CMakeLists.txt‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,8 @@ if(BOOST_CI_INSTALL_TEST)
1515
find_package(Boost CONFIG REQUIRED COMPONENTS corosio)
1616
else()
1717
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
18-
19-
set(deps
20-
# Low-level dependencies (order matters - these must come first)
21-
assert
22-
config
23-
core
24-
mp11
25-
predef
26-
static_assert
27-
throw_exception
28-
type_traits
29-
winapi
30-
31-
# Mid-level dependencies
32-
align
33-
compat
34-
optional
35-
variant2
36-
37-
# Primary dependencies (corosio)
38-
system
39-
capy
40-
)
41-
42-
foreach(dep IN LISTS deps)
43-
add_subdirectory(../../../${dep} boostorg/${dep} EXCLUDE_FROM_ALL)
44-
endforeach()
45-
46-
# Add corosio last, after all its dependencies
47-
add_subdirectory(../.. boostorg/corosio)
18+
set(BOOST_INCLUDE_LIBRARIES corosio)
19+
add_subdirectory(../../../.. deps/boost EXCLUDE_FROM_ALL)
4820
endif()
4921

5022
add_executable(main main.cpp)

‎test/unit/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
#
99

1010
file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp)
11+
12+
if (NOT OpenSSL_FOUND AND NOT WolfSSL_FOUND)
13+
list(FILTER PFILES EXCLUDE REGEX "tls_stream_stress\\.cpp$")
14+
endif()
15+
1116
list(APPEND PFILES
1217
CMakeLists.txt
1318
Jamfile)

‎test/unit/Jamfile‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ project boost/corosio/test/unit
2020
;
2121

2222
# Non-TLS tests
23-
for local f in [ glob *.cpp : openssl_stream.cpp wolfssl_stream.cpp cross_ssl_stream.cpp tls_stream.cpp ] [ glob test/*.cpp ]
23+
for local f in [ glob *.cpp : openssl_stream.cpp wolfssl_stream.cpp cross_ssl_stream.cpp tls_stream.cpp tls_stream_stress.cpp ] [ glob test/*.cpp ]
2424
{
2525
run $(f) ;
2626
}
@@ -50,3 +50,17 @@ run cross_ssl_stream.cpp
5050

5151
# TLS stream base tests (no specific TLS backend required)
5252
run tls_stream.cpp ;
53+
54+
# TLS stress tests - separate targets so each builds when its backend is found
55+
# (linking both would cause <build>no propagation to skip if either is missing)
56+
run tls_stream_stress.cpp
57+
: : :
58+
<library>/boost/corosio//boost_corosio_openssl
59+
: tls_stream_stress_openssl
60+
;
61+
62+
run tls_stream_stress.cpp
63+
: : :
64+
<library>/boost/corosio//boost_corosio_wolfssl
65+
: tls_stream_stress_wolfssl
66+
;

‎test/unit/test_utils.hpp‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
#include <type_traits>
2929
#include <vector>
3030

31+
// Valgrind slows execution ~10-20x; scale failsafe timeouts to avoid
32+
// false failures when BOOST_NO_STRESS_TEST is defined.
33+
#ifdef BOOST_NO_STRESS_TEST
34+
inline constexpr int failsafe_scale = 20;
35+
#else
36+
inline constexpr int failsafe_scale = 1;
37+
#endif
38+
3139
namespace boost::corosio::test {
3240

3341
//
@@ -845,7 +853,7 @@ run_tls_test_fail(
845853

846854
// Timer to unblock stuck handshakes (failsafe only)
847855
timer timeout(ioc);
848-
timeout.expires_after(std::chrono::milliseconds(200));
856+
timeout.expires_after(std::chrono::milliseconds(200 * failsafe_scale));
849857

850858
// Store lambdas in named variables before invoking - anonymous lambda + immediate
851859
// invocation pattern [...](){}() can cause capture corruption with run_async
@@ -995,7 +1003,7 @@ run_tls_shutdown_test(
9951003

9961004
// Failsafe timer in case of bugs
9971005
timer failsafe(ioc);
998-
failsafe.expires_after(std::chrono::milliseconds(200));
1006+
failsafe.expires_after(std::chrono::milliseconds(200 * failsafe_scale));
9991007

10001008
auto client_shutdown = [&client, &done, &failsafe]() -> capy::task<> {
10011009
auto [ec] = co_await client.shutdown();
@@ -1110,7 +1118,7 @@ run_tls_truncation_test(
11101118
// Timeout to prevent deadlock
11111119
timer timeout(ioc);
11121120
// IOCP peer-close propagation can be bursty under TLS backends.
1113-
timeout.expires_after(std::chrono::milliseconds(750));
1121+
timeout.expires_after(std::chrono::milliseconds(750 * failsafe_scale));
11141122

11151123
auto client_close = [&s1, &s2]() -> capy::task<> {
11161124
// Cancel and close underlying socket without TLS shutdown (IOCP needs cancel)
@@ -1388,7 +1396,7 @@ run_connection_reset_test(
13881396

13891397
// Timeout protection
13901398
timer timeout(ioc);
1391-
timeout.expires_after(std::chrono::milliseconds(200));
1399+
timeout.expires_after(std::chrono::milliseconds(200 * failsafe_scale));
13921400

13931401
auto client_task = [&client, &client_failed, &timeout]() -> capy::task<> {
13941402
auto [ec] = co_await client.handshake(
@@ -1471,7 +1479,7 @@ run_stop_token_handshake_test(
14711479
// Failsafe timeout to prevent infinite hang if cancellation doesn't work
14721480
// 2000ms allows headroom for CI with coverage instrumentation
14731481
timer failsafe(ioc);
1474-
failsafe.expires_after(std::chrono::milliseconds(2000));
1482+
failsafe.expires_after(std::chrono::milliseconds(2000 * failsafe_scale));
14751483

14761484
// Client handshake - will be cancelled while waiting for ServerHello
14771485
auto client_task = [&client, &client_got_error,
@@ -1573,7 +1581,7 @@ run_stop_token_read_test(
15731581

15741582
// Failsafe timeout - 2000ms allows headroom for CI with coverage instrumentation
15751583
timer failsafe(ioc);
1576-
failsafe.expires_after(std::chrono::milliseconds(2000));
1584+
failsafe.expires_after(std::chrono::milliseconds(2000 * failsafe_scale));
15771585

15781586
auto client_read = [&client, &read_got_error, &failsafe]() -> capy::task<> {
15791587
char buf[32];
@@ -1676,7 +1684,7 @@ run_stop_token_write_test(
16761684

16771685
// Failsafe timeout - 2000ms allows headroom for CI with coverage instrumentation
16781686
timer failsafe(ioc);
1679-
failsafe.expires_after(std::chrono::milliseconds(2000));
1687+
failsafe.expires_after(std::chrono::milliseconds(2000 * failsafe_scale));
16801688

16811689
auto client_write = [&client, &large_buf, &write_got_error,
16821690
&failsafe]() -> capy::task<> {
@@ -1767,7 +1775,7 @@ run_socket_cancel_test(
17671775

17681776
// Failsafe timeout - 2000ms allows headroom for CI with coverage instrumentation
17691777
timer failsafe(ioc);
1770-
failsafe.expires_after(std::chrono::milliseconds(2000));
1778+
failsafe.expires_after(std::chrono::milliseconds(2000 * failsafe_scale));
17711779

17721780
// Client starts handshake - will be cancelled
17731781
auto client_task = [&client, &client_got_error,

0 commit comments

Comments
 (0)