Skip to content

Commit

Permalink
misc CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
anarthal committed Dec 13, 2023
1 parent 87c6378 commit 9531ac3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 5 additions & 0 deletions test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ local requirements =
<define>BOOST_ASIO_DISABLE_BOOST_BIND=1
<define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
<define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
<define>BOOST_ASIO_DISABLE_BOOST_COROUTINE=1
<define>BOOST_ASIO_HAS_DEFAULT_FUNCTION_TEMPLATE_ARGUMENTS=1
<define>BOOST_ALLOW_DEPRECATED_HEADERS=1
<toolset>msvc:<cxxflags>"/bigobj"
Expand Down Expand Up @@ -141,11 +142,15 @@ alias common_test_sources
common/src/tracker_executor.cpp
;


alias boost_mysql_test
:
boost_mysql_compiled
# Unit test library generates some internal warnings we're not interested in
/boost/test//boost_unit_test_framework/<warnings-as-errors>off
# Boost.Context causes failures with warnings-as-errors
# under libc++, because it builds objects that raise a -stdlib=libc++ unused warning
/boost/context//boost_context/<warnings-as-errors>off
: requirements
<link>static
<include>common/include
Expand Down
6 changes: 0 additions & 6 deletions test/integration/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,15 @@ local test_filter = [ sequence.join $(test_exclusions) : ":" ] ;

local test_command = "-t $(test_filter)" ;

# Boost.Context causes failures with warnings-as-errors
# under libc++, because it builds objects that raise a -stdlib=libc++ unused warning
local context_lib = /boost/context//boost_context/<warnings-as-errors>off ;

cpp-pch pch
:
pch.hpp
$(context_lib)
/boost/mysql/test//boost_mysql_test
;


run
pch
$(context_lib)
/boost/mysql/test//common_test_sources
/boost/mysql/test//boost_mysql_test

Expand Down
6 changes: 5 additions & 1 deletion test/unit/test/connection_pool/connection_pool_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ class mock_timer

template <class CompletionToken>
auto async_wait(CompletionToken&& token)
-> decltype(asio::async_initiate<CompletionToken, void(error_code)>(initiate_wait(), token, this))
-> decltype(asio::async_initiate<CompletionToken, void(error_code)>(
initiate_wait(),
token,
std::declval<mock_timer*>()
))
{
return asio::async_initiate<CompletionToken, void(error_code)>(initiate_wait(), token, this);
}
Expand Down

0 comments on commit 9531ac3

Please sign in to comment.