Move extras/ to test/

2025-07-30 04:47:29 +02:00 · 2017-07-30 17:41:17 -07:00
parent df9ec6c7f3
commit 030f5eef87
44 changed files with 25 additions and 37 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,7 @@
 Version 96:

 * Move bench/ to test/
+* Move extras/ to test/

 --------------------------------------------------------------------------------

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -163,9 +163,8 @@ endif()
 # Tests and examples
 #

-include_directories (.)
-include_directories (extras)
 include_directories (include)
+include_directories (.)

 if (OPENSSL_FOUND)
    include_directories (${OPENSSL_INCLUDE_DIR})
@ -184,13 +183,6 @@ file (GLOB_RECURSE EXAMPLE_INCLUDES
    ${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
    (NOT "${VARIANT}" STREQUAL "coverage") AND
    (NOT "${VARIANT}" STREQUAL "ubasan"))
--- a/4
+++ b/4
@ -75,14 +75,14 @@ variant ubasan
 #cxx11_hdr_type_traits
 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
  : requirements
    #$(REQ)
    <implicit-dependency>/boost//headers
    <include>.
-    <include>./extras
+    <include>./test/extras/include
    #<use>/boost//headers
    <library>/boost/system//boost_system
    <library>/boost/coroutine//boost_coroutine
--- a/example/common/session_alloc.hpp
+++ b/example/common/session_alloc.hpp
@ -19,10 +19,6 @@
 #include <cstddef>
 #include <utility>

-#if 1
-#include "extras/boost/beast/unit_test/dstream.hpp"
-#endif
-
 template<class Context>
 class session_alloc_base
 {
@ -396,16 +392,6 @@ session_alloc_base<Context>::
 pool_t::
 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(buf_)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -7,6 +7,15 @@
 # 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)
    link_libraries (${OPENSSL_LIBRARIES})
 endif()
--- a/test/beast/CMakeLists.txt
+++ b/test/beast/CMakeLists.txt
@ -8,7 +8,7 @@
 #

 GroupSources(include/boost/beast beast)
-GroupSources(extras/boost/beast extras)
+GroupSources(test/extras/include/boost/beast extras)
 GroupSources(test/beast "/")

 add_executable (tests-beast
--- a/test/beast/core/CMakeLists.txt
+++ b/test/beast/core/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/beast/core "/")

--- a/test/beast/http/CMakeLists.txt
+++ b/test/beast/http/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/beast/http "/")

--- a/test/beast/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/beast/websocket "/")

--- a/test/beast/zlib/CMakeLists.txt
+++ b/test/beast/zlib/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/beast/zlib "/")

--- a/test/bench/buffers/CMakeLists.txt
+++ b/test/bench/buffers/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/bench/buffers "/")

--- a/test/bench/parser/CMakeLists.txt
+++ b/test/bench/parser/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/beast/http "/")
 GroupSources(test/bench/parser "/")
--- a/test/bench/utf8_checker/CMakeLists.txt
+++ b/test/bench/utf8_checker/CMakeLists.txt
@ -7,7 +7,7 @@
 # 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(test/bench/utf8_checker "/")

--- a/test/bench/wsload/CMakeLists.txt
+++ b/test/bench/wsload/CMakeLists.txt
@ -9,7 +9,7 @@

 GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
-GroupSources(extras/boost/beast extras)
+GroupSources(test/extras/include/boost/beast extras)
 GroupSources(test/bench/wsload "/")

 add_executable (bench-wsload
--- a/test/doc/CMakeLists.txt
+++ b/test/doc/CMakeLists.txt
@ -8,7 +8,7 @@
 #

 GroupSources(example example)
-GroupSources(extras/boost/beast extras)
+GroupSources(test/extras/include/boost/beast extras)
 GroupSources(include/boost/beast beast)
 GroupSources(test/doc "/")

--- a/test/example/common/CMakeLists.txt
+++ b/test/example/common/CMakeLists.txt
@ -8,7 +8,7 @@
 #

 GroupSources(example/common common)
-GroupSources(extras/boost/beast extras)
+GroupSources(test/extras/include/boost/beast extras)
 GroupSources(include/boost/beast beast)
 GroupSources(test/example/common "/")

--- a/test/example/server/CMakeLists.txt
+++ b/test/example/server/CMakeLists.txt
@ -9,7 +9,7 @@

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

--- a/test/extras/README.md
+++ b/test/extras/README.md
--- a/test/extras/include/boost/beast/doc_debug.hpp
+++ b/test/extras/include/boost/beast/doc_debug.hpp
--- a/test/extras/include/boost/beast/test/fail_counter.hpp
+++ b/test/extras/include/boost/beast/test/fail_counter.hpp
--- a/test/extras/include/boost/beast/test/fail_stream.hpp
+++ b/test/extras/include/boost/beast/test/fail_stream.hpp
--- a/test/extras/include/boost/beast/test/fuzz.hpp
+++ b/test/extras/include/boost/beast/test/fuzz.hpp
--- a/test/extras/include/boost/beast/test/pipe_stream.hpp
+++ b/test/extras/include/boost/beast/test/pipe_stream.hpp
--- a/test/extras/include/boost/beast/test/sig_wait.hpp
+++ b/test/extras/include/boost/beast/test/sig_wait.hpp
--- a/test/extras/include/boost/beast/test/stream.hpp
+++ b/test/extras/include/boost/beast/test/stream.hpp
--- a/test/extras/include/boost/beast/test/string_iostream.hpp
+++ b/test/extras/include/boost/beast/test/string_iostream.hpp
--- a/test/extras/include/boost/beast/test/string_istream.hpp
+++ b/test/extras/include/boost/beast/test/string_istream.hpp
--- a/test/extras/include/boost/beast/test/string_ostream.hpp
+++ b/test/extras/include/boost/beast/test/string_ostream.hpp
--- a/test/extras/include/boost/beast/test/test_allocator.hpp
+++ b/test/extras/include/boost/beast/test/test_allocator.hpp
--- a/test/extras/include/boost/beast/test/yield_to.hpp
+++ b/test/extras/include/boost/beast/test/yield_to.hpp
--- a/test/extras/include/boost/beast/unit_test/amount.hpp
+++ b/test/extras/include/boost/beast/unit_test/amount.hpp
--- a/test/extras/include/boost/beast/unit_test/detail/const_container.hpp
+++ b/test/extras/include/boost/beast/unit_test/detail/const_container.hpp
--- a/test/extras/include/boost/beast/unit_test/dstream.hpp
+++ b/test/extras/include/boost/beast/unit_test/dstream.hpp
--- a/test/extras/include/boost/beast/unit_test/global_suites.hpp
+++ b/test/extras/include/boost/beast/unit_test/global_suites.hpp
--- a/test/extras/include/boost/beast/unit_test/main.cpp
+++ b/test/extras/include/boost/beast/unit_test/main.cpp
--- a/test/extras/include/boost/beast/unit_test/match.hpp
+++ b/test/extras/include/boost/beast/unit_test/match.hpp
--- a/test/extras/include/boost/beast/unit_test/recorder.hpp
+++ b/test/extras/include/boost/beast/unit_test/recorder.hpp
--- a/test/extras/include/boost/beast/unit_test/reporter.hpp
+++ b/test/extras/include/boost/beast/unit_test/reporter.hpp
--- a/test/extras/include/boost/beast/unit_test/results.hpp
+++ b/test/extras/include/boost/beast/unit_test/results.hpp
--- a/test/extras/include/boost/beast/unit_test/runner.hpp
+++ b/test/extras/include/boost/beast/unit_test/runner.hpp
--- a/test/extras/include/boost/beast/unit_test/suite.hpp
+++ b/test/extras/include/boost/beast/unit_test/suite.hpp
--- a/test/extras/include/boost/beast/unit_test/suite_info.hpp
+++ b/test/extras/include/boost/beast/unit_test/suite_info.hpp
--- a/test/extras/include/boost/beast/unit_test/suite_list.hpp
+++ b/test/extras/include/boost/beast/unit_test/suite_list.hpp
--- a/test/extras/include/boost/beast/unit_test/thread.hpp
+++ b/test/extras/include/boost/beast/unit_test/thread.hpp