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

Move extras/ to test/

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-30 17:41:17 -07:00
parent df9ec6c7f3
commit 030f5eef87
44 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
Version 96: Version 96:
* Move bench/ to test/ * Move bench/ to test/
* Move extras/ to test/
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

10
CMakeLists.txt
View File

@ -163,9 +163,8 @@ endif()
# Tests and examples # Tests and examples
# #
include_directories (.)
include_directories (extras)
include_directories (include) include_directories (include)
include_directories (.)
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
include_directories (${OPENSSL_INCLUDE_DIR}) include_directories (${OPENSSL_INCLUDE_DIR})
@ -184,13 +183,6 @@ file (GLOB_RECURSE EXAMPLE_INCLUDES
${PROJECT_SOURCE_DIR}/example/*.hpp ${PROJECT_SOURCE_DIR}/example/*.hpp
) )
file (GLOB_RECURSE EXTRAS_INCLUDES
${PROJECT_SOURCE_DIR}/extras/boost/beast/*.hpp
${PROJECT_SOURCE_DIR}/extras/boost/beast/*.ipp
)
set (TEST_MAIN ${PROJECT_SOURCE_DIR}/extras/boost/beast/unit_test/main.cpp)
if (Beast_BUILD_EXAMPLES AND if (Beast_BUILD_EXAMPLES AND
(NOT "${VARIANT}" STREQUAL "coverage") AND (NOT "${VARIANT}" STREQUAL "coverage") AND
(NOT "${VARIANT}" STREQUAL "ubasan")) (NOT "${VARIANT}" STREQUAL "ubasan"))

4
Jamfile
View File

@ -75,14 +75,14 @@ variant ubasan
#cxx11_hdr_type_traits #cxx11_hdr_type_traits
local REQ = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_hdr_tuple ] ; local REQ = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_hdr_tuple ] ;
path-constant TEST_MAIN : extras/boost/beast/unit_test/main.cpp ; path-constant TEST_MAIN : test/extras/include/boost/beast/unit_test/main.cpp ;
project beast project beast
: requirements : requirements
#$(REQ) #$(REQ)
<implicit-dependency>/boost//headers <implicit-dependency>/boost//headers
<include>. <include>.
<include>./extras <include>./test/extras/include
#<use>/boost//headers #<use>/boost//headers
<library>/boost/system//boost_system <library>/boost/system//boost_system
<library>/boost/coroutine//boost_coroutine <library>/boost/coroutine//boost_coroutine

14
example/common/session_alloc.hpp
View File

@ -19,10 +19,6 @@
#include <cstddef> #include <cstddef>
#include <utility> #include <utility>
#if 1
#include "extras/boost/beast/unit_test/dstream.hpp"
#endif
template<class Context> template<class Context>
class session_alloc_base class session_alloc_base
{ {
@ -396,16 +392,6 @@ session_alloc_base<Context>::
pool_t:: pool_t::
alloc(std::size_t n) alloc(std::size_t n)
{ {
#if 0
beast::unit_test::dstream dout{std::cout};
dout <<
"n=" << n << ", "
"list_.size()=" << list_.size() << ", "
"used=" << (list_.empty() ? 0 : list_.back().used()) << ", "
"size_=" << size_ << ", "
"high_=" << high_ <<
std::endl;
#endif
if(list_.empty() && size_ < high_) if(list_.empty() && size_ < high_)
{ {
if(buf_) if(buf_)

9
test/CMakeLists.txt
View File

@ -7,6 +7,15 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
include_directories (extras/include)
file (GLOB_RECURSE EXTRAS_INCLUDES
${PROJECT_SOURCE_DIR}/test/extras/include/boost/beast/*.hpp
${PROJECT_SOURCE_DIR}/test/extras/include/boost/beast/*.ipp
)
set (TEST_MAIN ${PROJECT_SOURCE_DIR}/test/extras/include/boost/beast/unit_test/main.cpp)
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
link_libraries (${OPENSSL_LIBRARIES}) link_libraries (${OPENSSL_LIBRARIES})
endif() endif()

2
test/beast/CMakeLists.txt
View File

@ -8,7 +8,7 @@
# #
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(test/beast "/") GroupSources(test/beast "/")
add_executable (tests-beast add_executable (tests-beast

2
test/beast/core/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/beast/core "/") GroupSources(test/beast/core "/")

2
test/beast/http/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/beast/http "/") GroupSources(test/beast/http "/")

2
test/beast/websocket/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/beast/websocket "/") GroupSources(test/beast/websocket "/")

2
test/beast/zlib/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/beast/zlib "/") GroupSources(test/beast/zlib "/")

2
test/bench/buffers/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/bench/buffers "/") GroupSources(test/bench/buffers "/")

2
test/bench/parser/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/beast/http "/") GroupSources(test/beast/http "/")
GroupSources(test/bench/parser "/") GroupSources(test/bench/parser "/")

2
test/bench/utf8_checker/CMakeLists.txt
View File

@ -7,7 +7,7 @@
# Official repository: https://github.com/boostorg/beast # Official repository: https://github.com/boostorg/beast
# #
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/bench/utf8_checker "/") GroupSources(test/bench/utf8_checker "/")

2
test/bench/wsload/CMakeLists.txt
View File

@ -9,7 +9,7 @@
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(example/common common) GroupSources(example/common common)
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(test/bench/wsload "/") GroupSources(test/bench/wsload "/")
add_executable (bench-wsload add_executable (bench-wsload

2
test/doc/CMakeLists.txt
View File

@ -8,7 +8,7 @@
# #
GroupSources(example example) GroupSources(example example)
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/doc "/") GroupSources(test/doc "/")

2
test/example/common/CMakeLists.txt
View File

@ -8,7 +8,7 @@
# #
GroupSources(example/common common) GroupSources(example/common common)
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/example/common "/") GroupSources(test/example/common "/")

2
test/example/server/CMakeLists.txt
View File

@ -9,7 +9,7 @@
GroupSources(example/server-framework framework) GroupSources(example/server-framework framework)
GroupSources(example/common common) GroupSources(example/common common)
GroupSources(extras/boost/beast extras) GroupSources(test/extras/include/boost/beast extras)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(test/example/server "/") GroupSources(test/example/server "/")

0
extras/README.md → test/extras/README.md
View File

0
extras/boost/beast/doc_debug.hpp → test/extras/include/boost/beast/doc_debug.hpp
View File

0
extras/boost/beast/test/fail_counter.hpp → test/extras/include/boost/beast/test/fail_counter.hpp
View File

0
extras/boost/beast/test/fail_stream.hpp → test/extras/include/boost/beast/test/fail_stream.hpp
View File

0
extras/boost/beast/test/fuzz.hpp → test/extras/include/boost/beast/test/fuzz.hpp
View File

0
extras/boost/beast/test/pipe_stream.hpp → test/extras/include/boost/beast/test/pipe_stream.hpp
View File

0
extras/boost/beast/test/sig_wait.hpp → test/extras/include/boost/beast/test/sig_wait.hpp
View File

0
extras/boost/beast/test/stream.hpp → test/extras/include/boost/beast/test/stream.hpp
View File

0
extras/boost/beast/test/string_iostream.hpp → test/extras/include/boost/beast/test/string_iostream.hpp
View File

0
extras/boost/beast/test/string_istream.hpp → test/extras/include/boost/beast/test/string_istream.hpp
View File

0
extras/boost/beast/test/string_ostream.hpp → test/extras/include/boost/beast/test/string_ostream.hpp
View File

0
extras/boost/beast/test/test_allocator.hpp → test/extras/include/boost/beast/test/test_allocator.hpp
View File

0
extras/boost/beast/test/yield_to.hpp → test/extras/include/boost/beast/test/yield_to.hpp
View File

0
extras/boost/beast/unit_test/amount.hpp → test/extras/include/boost/beast/unit_test/amount.hpp
View File

0
extras/boost/beast/unit_test/detail/const_container.hpp → test/extras/include/boost/beast/unit_test/detail/const_container.hpp
View File

0
extras/boost/beast/unit_test/dstream.hpp → test/extras/include/boost/beast/unit_test/dstream.hpp
View File

0
extras/boost/beast/unit_test/global_suites.hpp → test/extras/include/boost/beast/unit_test/global_suites.hpp
View File

0
extras/boost/beast/unit_test/main.cpp → test/extras/include/boost/beast/unit_test/main.cpp
View File

0
extras/boost/beast/unit_test/match.hpp → test/extras/include/boost/beast/unit_test/match.hpp
View File

0
extras/boost/beast/unit_test/recorder.hpp → test/extras/include/boost/beast/unit_test/recorder.hpp
View File

0
extras/boost/beast/unit_test/reporter.hpp → test/extras/include/boost/beast/unit_test/reporter.hpp
View File

0
extras/boost/beast/unit_test/results.hpp → test/extras/include/boost/beast/unit_test/results.hpp
View File

0
extras/boost/beast/unit_test/runner.hpp → test/extras/include/boost/beast/unit_test/runner.hpp
View File

0
extras/boost/beast/unit_test/suite.hpp → test/extras/include/boost/beast/unit_test/suite.hpp
View File

0
extras/boost/beast/unit_test/suite_info.hpp → test/extras/include/boost/beast/unit_test/suite_info.hpp
View File

0
extras/boost/beast/unit_test/suite_list.hpp → test/extras/include/boost/beast/unit_test/suite_list.hpp
View File

0
extras/boost/beast/unit_test/thread.hpp → test/extras/include/boost/beast/unit_test/thread.hpp
View File