Move extras/ to test/

CHANGELOG.md

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

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"))

Jamfile

@@ -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

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_)

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()

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

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 "/")
 

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 "/")
 

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 "/")
 

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 "/")
 

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 "/")
 

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 "/")

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 "/")
 

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

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 "/")
 

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 "/")
 

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 "/")