boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 12:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up Jamfile and tests

Browse Source
This commit is contained in:
Vinnie Falco
2017-08-10 17:44:21 -07:00
parent 483a4c5da5
commit a56b390638
5 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
Version 105: Version 105:
* Fix compile error in websocket snippet * Fix compile error in websocket snippet
* Tidy up Jamfile and tests
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

40
Jamfile
View File

@ -13,8 +13,6 @@ import boost ;
import modules ; import modules ;
import testing ; import testing ;
import ../config/checks/config : requires ;
boost.use-project ; boost.use-project ;
if [ os.name ] = SOLARIS if [ os.name ] = SOLARIS
@ -51,57 +49,47 @@ else
lib crypto ; lib crypto ;
} }
variant coverage : variant coverage
debug : debug
: : <cxxflags>"-msse4.2 --coverage"
<cxxflags>"-msse4.2 --coverage"
<linkflags>"--coverage" <linkflags>"--coverage"
; ;
variant valgrind : variant valgrind
release : release
: : <valgrind>on # Boost.Context uses this property
<valgrind>on # Boost.Context uses this property ;
;
variant ubasan variant ubasan
: : release
release : <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
:
<cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
<linkflags>"-fsanitize=address,undefined" <linkflags>"-fsanitize=address,undefined"
<define>BOOST_USE_ASAN=1 <define>BOOST_USE_ASAN=1
; ;
#cxx11_hdr_type_traits
local REQ = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_hdr_tuple ] ;
path-constant TEST_MAIN : test/extras/include/boost/beast/unit_test/main.cpp ; path-constant TEST_MAIN : test/extras/include/boost/beast/unit_test/main.cpp ;
project /boost/beast project /boost/beast
: requirements : requirements
#$(REQ)
<implicit-dependency>/boost//headers <implicit-dependency>/boost//headers
<include>. <include>.
<include>./test/extras/include <include>./test/extras/include
#<use>/boost//headers
<library>/boost/system//boost_system <library>/boost/system//boost_system
<library>/boost/coroutine//boost_coroutine <library>/boost/coroutine//boost_coroutine
<library>/boost/filesystem//boost_filesystem <library>/boost/filesystem//boost_filesystem
<link>static
<define>BOOST_ALL_NO_LIB=1
<define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
<threading>multi <threading>multi
<runtime-link>shared <runtime-link>shared
<debug-symbols>on <debug-symbols>on
<define>BOOST_ALL_NO_LIB=1
<define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1 <define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
<define>BOOST_ASIO_DISABLE_BOOST_BIND=1 <define>BOOST_ASIO_DISABLE_BOOST_BIND=1
<define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1 <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
<define>BOOST_ASIO_DISABLE_BOOST_REGEX=1 <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
<define>BOOST_ASIO_NO_DEPRECATED=1 <define>BOOST_ASIO_NO_DEPRECATED=1
<define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
<toolset>msvc:<cxxflags>"/bigobj"
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1 <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1 <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
<toolset>msvc:<cxxflags>"/bigobj"
<toolset>msvc:<variant>release:<cxxflags>"/Ob2 /Oi /Ot" <toolset>msvc:<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
<os>SOLARIS:<library>socket <os>SOLARIS:<library>socket
<os>SOLARIS:<library>nsl <os>SOLARIS:<library>nsl

6
test/beast/http/chunk_encode.cpp
View File

@ -65,11 +65,11 @@ public:
void void
check_fwd(string_view match, Args&&... args) check_fwd(string_view match, Args&&... args)
{ {
T t{std::forward<Args>(args)...}; T t(std::forward<Args>(args)...);
BEAST_EXPECT(to_string(t) == match); BEAST_EXPECT(to_string(t) == match);
T t2{t}; T t2(t);
BEAST_EXPECT(to_string(t2) == match); BEAST_EXPECT(to_string(t2) == match);
T t3{std::move(t2)}; T t3(std::move(t2));
BEAST_EXPECT(to_string(t3) == match); BEAST_EXPECT(to_string(t3) == match);
} }

4
test/example/common/root_certificates.cpp
View File

@ -7,6 +7,10 @@
// Official repository: https://github.com/boostorg/beast // Official repository: https://github.com/boostorg/beast
// //
#if BOOST_BEAST_USE_OPENSSL
// Test that header file is self-contained. // Test that header file is self-contained.
#include "example/common/root_certificates.hpp" #include "example/common/root_certificates.hpp"
#endif

3
test/example/common/server_certificate.cpp
View File

@ -7,6 +7,9 @@
// Official repository: https://github.com/boostorg/beast // Official repository: https://github.com/boostorg/beast
// //
#if BOOST_BEAST_USE_OPENSSL
// Test that header file is self-contained. // Test that header file is self-contained.
#include "example/common/server_certificate.hpp" #include "example/common/server_certificate.hpp"
#endif