Protect some test & examples with acceptable boost version

Author: basiliscos

.travis.yml

@@ -8,12 +8,12 @@ os:
     - linux
 
 before_script:
-    - wget -q -O - https://sourceforge.net/projects/boost/files/boost/1.69.0/boost_1_69_0.tar.gz | tar -xz
-    - cd boost_1_69_0 && ./bootstrap.sh --with-libraries=coroutine,context,chrono,system,thread,regex,filesystem,program_options
+    - wget -q -O - https://sourceforge.net/projects/boost/files/boost/1.70.0/boost_1_70_0.tar.gz | tar -xz
+    - cd boost_1_70_0 && ./bootstrap.sh --with-libraries=coroutine,context,chrono,system,thread,regex,filesystem,program_options
     - ./b2  --ignore-site-config && cd ..
     - mkdir build
     - cd build
-    - cmake -DBOOST_ROOT=`pwd`/../boost_1_69_0 ..
+    - cmake -DBOOST_ROOT=`pwd`/../boost_1_70_0 ..
 
 addons:
   apt:

CMakeLists.txt

@@ -78,6 +78,8 @@ else()
     set(LINK_DEPENDENCIES pthread ${Boost_LIBRARIES} catch_lib) #  asan ubsan
 endif()
 
+set(BOOST_VERSION_OK, (Boost_MAJOR_VERSION GREATER_EQUAL 1) AND (Boost_MINOR_VERSION GREATER_EQUAL 70))
+
 add_subdirectory(examples)
 
 add_executable(t-05-protocol t/05-protocol.cpp)
@@ -138,9 +140,11 @@ add_executable(t-19-transaction t/19-transaction.cpp)
 target_link_libraries(t-19-transaction ${LINK_DEPENDENCIES})
 add_test("t-19-transaction" t-19-transaction)
 
-add_executable(t-20-promise t/20-promise.cpp)
-target_link_libraries(t-20-promise ${LINK_DEPENDENCIES})
-add_test("t-20-promise" t-20-promise)
+if(BOOST_VERSION_OK)
+    add_executable(t-20-promise t/20-promise.cpp)
+    target_link_libraries(t-20-promise ${LINK_DEPENDENCIES})
+    add_test("t-20-promise" t-20-promise)
+endif()
 
 add_executable(t-21-coroutine t/21-coroutine.cpp)
 target_link_libraries(t-21-coroutine ${LINK_DEPENDENCIES})
@@ -154,7 +158,7 @@ add_executable(t-23-stream t/23-stream.cpp)
 target_link_libraries(t-23-stream ${LINK_DEPENDENCIES})
 add_test("t-23-stream" t-23-stream)
 
-if((Boost_MAJOR_VERSION GREATER_EQUAL 1) AND (Boost_MINOR_VERSION GREATER_EQUAL 70))
+if(BOOST_VERSION_OK)
     add_executable(t-24-dynbuff t/24-dynbuff.cpp)
     target_link_libraries(t-24-dynbuff ${LINK_DEPENDENCIES})
     add_test("t-24-dynbuff" t-24-dynbuff)

examples/CMakeLists.txt

@@ -8,8 +8,10 @@ target_link_libraries(stream-parse ${LINK_DEPENDENCIES})
 add_executable(synch-subscription synch-subscription.cpp)
 target_link_libraries(synch-subscription ${LINK_DEPENDENCIES})
 
-add_executable(speed_test_async_multi speed_test_async_multi.cpp)
-target_link_libraries(speed_test_async_multi ${LINK_DEPENDENCIES})
+if(BOOST_VERSION_OK)
+    add_executable(speed_test_async_multi speed_test_async_multi.cpp)
+    target_link_libraries(speed_test_async_multi ${LINK_DEPENDENCIES})
+endif()
 
 add_executable(multi-threads-1 multi-threads-1.cpp)
 target_link_libraries(multi-threads-1 ${LINK_DEPENDENCIES})

examples/speed_test_async_multi.cpp

@@ -53,17 +53,15 @@ int main(int argc, char **argv) {
     // common setup
     using socket_t = asio::ip::tcp::socket;
     using next_layer_t = socket_t;
-    using Buffer = boost::asio::streambuf;
-    /*
+    //using Buffer = boost::asio::streambuf;
     using Buffer = boost::asio::dynamic_string_buffer<
         std::string::value_type,
         std::string::traits_type,
         std::string::allocator_type
     >;
-    */
     using Iterator = typename r::to_iterator<Buffer>::iterator_t;
-    //using policy_t = r::parsing_policy::drop_result;
-    using policy_t = r::parsing_policy::keep_result;
+    using policy_t = r::parsing_policy::drop_result;
+    //using policy_t = r::parsing_policy::keep_result;
 
     if (argc < 2) {
         std::cout << "Usage : " << argv[0] << " ip:port \n";
@@ -103,9 +101,11 @@ int main(int argc, char **argv) {
     // wrap it into bredis connection
     r::Connection<next_layer_t> c(std::move(socket));
 
-    //std::string tx_backend, rx_backend;
-    //Buffer tx_buff(tx_backend), rx_buff(rx_backend);
-    Buffer tx_buff, rx_buff;
+    std::string tx_backend, rx_backend;
+    //tx_backend.reserve(cmds_count * 4);
+    //rx_backend.reserve(cmds_count * 4);
+    Buffer tx_buff(tx_backend), rx_buff(rx_backend);
+    //Buffer tx_buff, rx_buff;
     std::promise<void> completion_promise;
     auto completion_future = completion_promise.get_future();