From 030f5eef87239a481603a33e840f2a81f5f72ba8 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 30 Jul 2017 17:41:17 -0700 Subject: [PATCH] Move extras/ to test/ --- CHANGELOG.md | 1 + CMakeLists.txt | 10 +--------- Jamfile | 4 ++-- example/common/session_alloc.hpp | 14 -------------- test/CMakeLists.txt | 9 +++++++++ test/beast/CMakeLists.txt | 2 +- test/beast/core/CMakeLists.txt | 2 +- test/beast/http/CMakeLists.txt | 2 +- test/beast/websocket/CMakeLists.txt | 2 +- test/beast/zlib/CMakeLists.txt | 2 +- test/bench/buffers/CMakeLists.txt | 2 +- test/bench/parser/CMakeLists.txt | 2 +- test/bench/utf8_checker/CMakeLists.txt | 2 +- test/bench/wsload/CMakeLists.txt | 2 +- test/doc/CMakeLists.txt | 2 +- test/example/common/CMakeLists.txt | 2 +- test/example/server/CMakeLists.txt | 2 +- {extras => test/extras}/README.md | 0 .../extras/include}/boost/beast/doc_debug.hpp | 0 .../include}/boost/beast/test/fail_counter.hpp | 0 .../include}/boost/beast/test/fail_stream.hpp | 0 .../extras/include}/boost/beast/test/fuzz.hpp | 0 .../include}/boost/beast/test/pipe_stream.hpp | 0 .../extras/include}/boost/beast/test/sig_wait.hpp | 0 .../extras/include}/boost/beast/test/stream.hpp | 0 .../include}/boost/beast/test/string_iostream.hpp | 0 .../include}/boost/beast/test/string_istream.hpp | 0 .../include}/boost/beast/test/string_ostream.hpp | 0 .../include}/boost/beast/test/test_allocator.hpp | 0 .../extras/include}/boost/beast/test/yield_to.hpp | 0 .../include}/boost/beast/unit_test/amount.hpp | 0 .../beast/unit_test/detail/const_container.hpp | 0 .../include}/boost/beast/unit_test/dstream.hpp | 0 .../boost/beast/unit_test/global_suites.hpp | 0 .../extras/include}/boost/beast/unit_test/main.cpp | 0 .../include}/boost/beast/unit_test/match.hpp | 0 .../include}/boost/beast/unit_test/recorder.hpp | 0 .../include}/boost/beast/unit_test/reporter.hpp | 0 .../include}/boost/beast/unit_test/results.hpp | 0 .../include}/boost/beast/unit_test/runner.hpp | 0 .../include}/boost/beast/unit_test/suite.hpp | 0 .../include}/boost/beast/unit_test/suite_info.hpp | 0 .../include}/boost/beast/unit_test/suite_list.hpp | 0 .../include}/boost/beast/unit_test/thread.hpp | 0 44 files changed, 25 insertions(+), 37 deletions(-) rename {extras => test/extras}/README.md (100%) rename {extras => test/extras/include}/boost/beast/doc_debug.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/fail_counter.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/fail_stream.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/fuzz.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/pipe_stream.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/sig_wait.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/stream.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/string_iostream.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/string_istream.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/string_ostream.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/test_allocator.hpp (100%) rename {extras => test/extras/include}/boost/beast/test/yield_to.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/amount.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/detail/const_container.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/dstream.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/global_suites.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/main.cpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/match.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/recorder.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/reporter.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/results.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/runner.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/suite.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/suite_info.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/suite_list.hpp (100%) rename {extras => test/extras/include}/boost/beast/unit_test/thread.hpp (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cf3288..4c3f623c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Version 96: * Move bench/ to test/ +* Move extras/ to test/ -------------------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 60a655eb..85c51cd2 100644 --- 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")) diff --git a/Jamfile b/Jamfile index 1320ecad..9ee2717f 100644 --- a/Jamfile +++ b/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) /boost//headers . - ./extras + ./test/extras/include #/boost//headers /boost/system//boost_system /boost/coroutine//boost_coroutine diff --git a/example/common/session_alloc.hpp b/example/common/session_alloc.hpp index 8b859009..5730e235 100644 --- a/example/common/session_alloc.hpp +++ b/example/common/session_alloc.hpp @@ -19,10 +19,6 @@ #include #include -#if 1 -#include "extras/boost/beast/unit_test/dstream.hpp" -#endif - template class session_alloc_base { @@ -396,16 +392,6 @@ session_alloc_base:: 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_) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2d17750e..0d2377f8 100644 --- 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() diff --git a/test/beast/CMakeLists.txt b/test/beast/CMakeLists.txt index aa443d75..2a16f171 100644 --- 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 diff --git a/test/beast/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt index 0a906a56..14997e1c 100644 --- 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 "/") diff --git a/test/beast/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt index 4dc482b6..a6a013ad 100644 --- 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 "/") diff --git a/test/beast/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt index 1b38c7da..3a32eba7 100644 --- 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 "/") diff --git a/test/beast/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt index b1074f48..43a04f9f 100644 --- 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 "/") diff --git a/test/bench/buffers/CMakeLists.txt b/test/bench/buffers/CMakeLists.txt index 9eec8337..5095b600 100644 --- 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 "/") diff --git a/test/bench/parser/CMakeLists.txt b/test/bench/parser/CMakeLists.txt index 6f293569..2d58cad1 100644 --- 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 "/") diff --git a/test/bench/utf8_checker/CMakeLists.txt b/test/bench/utf8_checker/CMakeLists.txt index fc982f1b..0399b470 100644 --- 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 "/") diff --git a/test/bench/wsload/CMakeLists.txt b/test/bench/wsload/CMakeLists.txt index 329a023c..f4a6ba46 100644 --- 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 diff --git a/test/doc/CMakeLists.txt b/test/doc/CMakeLists.txt index 12fa2bf0..4ce6c047 100644 --- 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 "/") diff --git a/test/example/common/CMakeLists.txt b/test/example/common/CMakeLists.txt index e45e7b01..3c308872 100644 --- 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 "/") diff --git a/test/example/server/CMakeLists.txt b/test/example/server/CMakeLists.txt index e85d5feb..4b29690c 100644 --- 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 "/") diff --git a/extras/README.md b/test/extras/README.md similarity index 100% rename from extras/README.md rename to test/extras/README.md diff --git a/extras/boost/beast/doc_debug.hpp b/test/extras/include/boost/beast/doc_debug.hpp similarity index 100% rename from extras/boost/beast/doc_debug.hpp rename to test/extras/include/boost/beast/doc_debug.hpp diff --git a/extras/boost/beast/test/fail_counter.hpp b/test/extras/include/boost/beast/test/fail_counter.hpp similarity index 100% rename from extras/boost/beast/test/fail_counter.hpp rename to test/extras/include/boost/beast/test/fail_counter.hpp diff --git a/extras/boost/beast/test/fail_stream.hpp b/test/extras/include/boost/beast/test/fail_stream.hpp similarity index 100% rename from extras/boost/beast/test/fail_stream.hpp rename to test/extras/include/boost/beast/test/fail_stream.hpp diff --git a/extras/boost/beast/test/fuzz.hpp b/test/extras/include/boost/beast/test/fuzz.hpp similarity index 100% rename from extras/boost/beast/test/fuzz.hpp rename to test/extras/include/boost/beast/test/fuzz.hpp diff --git a/extras/boost/beast/test/pipe_stream.hpp b/test/extras/include/boost/beast/test/pipe_stream.hpp similarity index 100% rename from extras/boost/beast/test/pipe_stream.hpp rename to test/extras/include/boost/beast/test/pipe_stream.hpp diff --git a/extras/boost/beast/test/sig_wait.hpp b/test/extras/include/boost/beast/test/sig_wait.hpp similarity index 100% rename from extras/boost/beast/test/sig_wait.hpp rename to test/extras/include/boost/beast/test/sig_wait.hpp diff --git a/extras/boost/beast/test/stream.hpp b/test/extras/include/boost/beast/test/stream.hpp similarity index 100% rename from extras/boost/beast/test/stream.hpp rename to test/extras/include/boost/beast/test/stream.hpp diff --git a/extras/boost/beast/test/string_iostream.hpp b/test/extras/include/boost/beast/test/string_iostream.hpp similarity index 100% rename from extras/boost/beast/test/string_iostream.hpp rename to test/extras/include/boost/beast/test/string_iostream.hpp diff --git a/extras/boost/beast/test/string_istream.hpp b/test/extras/include/boost/beast/test/string_istream.hpp similarity index 100% rename from extras/boost/beast/test/string_istream.hpp rename to test/extras/include/boost/beast/test/string_istream.hpp diff --git a/extras/boost/beast/test/string_ostream.hpp b/test/extras/include/boost/beast/test/string_ostream.hpp similarity index 100% rename from extras/boost/beast/test/string_ostream.hpp rename to test/extras/include/boost/beast/test/string_ostream.hpp diff --git a/extras/boost/beast/test/test_allocator.hpp b/test/extras/include/boost/beast/test/test_allocator.hpp similarity index 100% rename from extras/boost/beast/test/test_allocator.hpp rename to test/extras/include/boost/beast/test/test_allocator.hpp diff --git a/extras/boost/beast/test/yield_to.hpp b/test/extras/include/boost/beast/test/yield_to.hpp similarity index 100% rename from extras/boost/beast/test/yield_to.hpp rename to test/extras/include/boost/beast/test/yield_to.hpp diff --git a/extras/boost/beast/unit_test/amount.hpp b/test/extras/include/boost/beast/unit_test/amount.hpp similarity index 100% rename from extras/boost/beast/unit_test/amount.hpp rename to test/extras/include/boost/beast/unit_test/amount.hpp diff --git a/extras/boost/beast/unit_test/detail/const_container.hpp b/test/extras/include/boost/beast/unit_test/detail/const_container.hpp similarity index 100% rename from extras/boost/beast/unit_test/detail/const_container.hpp rename to test/extras/include/boost/beast/unit_test/detail/const_container.hpp diff --git a/extras/boost/beast/unit_test/dstream.hpp b/test/extras/include/boost/beast/unit_test/dstream.hpp similarity index 100% rename from extras/boost/beast/unit_test/dstream.hpp rename to test/extras/include/boost/beast/unit_test/dstream.hpp diff --git a/extras/boost/beast/unit_test/global_suites.hpp b/test/extras/include/boost/beast/unit_test/global_suites.hpp similarity index 100% rename from extras/boost/beast/unit_test/global_suites.hpp rename to test/extras/include/boost/beast/unit_test/global_suites.hpp diff --git a/extras/boost/beast/unit_test/main.cpp b/test/extras/include/boost/beast/unit_test/main.cpp similarity index 100% rename from extras/boost/beast/unit_test/main.cpp rename to test/extras/include/boost/beast/unit_test/main.cpp diff --git a/extras/boost/beast/unit_test/match.hpp b/test/extras/include/boost/beast/unit_test/match.hpp similarity index 100% rename from extras/boost/beast/unit_test/match.hpp rename to test/extras/include/boost/beast/unit_test/match.hpp diff --git a/extras/boost/beast/unit_test/recorder.hpp b/test/extras/include/boost/beast/unit_test/recorder.hpp similarity index 100% rename from extras/boost/beast/unit_test/recorder.hpp rename to test/extras/include/boost/beast/unit_test/recorder.hpp diff --git a/extras/boost/beast/unit_test/reporter.hpp b/test/extras/include/boost/beast/unit_test/reporter.hpp similarity index 100% rename from extras/boost/beast/unit_test/reporter.hpp rename to test/extras/include/boost/beast/unit_test/reporter.hpp diff --git a/extras/boost/beast/unit_test/results.hpp b/test/extras/include/boost/beast/unit_test/results.hpp similarity index 100% rename from extras/boost/beast/unit_test/results.hpp rename to test/extras/include/boost/beast/unit_test/results.hpp diff --git a/extras/boost/beast/unit_test/runner.hpp b/test/extras/include/boost/beast/unit_test/runner.hpp similarity index 100% rename from extras/boost/beast/unit_test/runner.hpp rename to test/extras/include/boost/beast/unit_test/runner.hpp diff --git a/extras/boost/beast/unit_test/suite.hpp b/test/extras/include/boost/beast/unit_test/suite.hpp similarity index 100% rename from extras/boost/beast/unit_test/suite.hpp rename to test/extras/include/boost/beast/unit_test/suite.hpp diff --git a/extras/boost/beast/unit_test/suite_info.hpp b/test/extras/include/boost/beast/unit_test/suite_info.hpp similarity index 100% rename from extras/boost/beast/unit_test/suite_info.hpp rename to test/extras/include/boost/beast/unit_test/suite_info.hpp diff --git a/extras/boost/beast/unit_test/suite_list.hpp b/test/extras/include/boost/beast/unit_test/suite_list.hpp similarity index 100% rename from extras/boost/beast/unit_test/suite_list.hpp rename to test/extras/include/boost/beast/unit_test/suite_list.hpp diff --git a/extras/boost/beast/unit_test/thread.hpp b/test/extras/include/boost/beast/unit_test/thread.hpp similarity index 100% rename from extras/boost/beast/unit_test/thread.hpp rename to test/extras/include/boost/beast/unit_test/thread.hpp