Merge branch 'develop' into feature/connect-fsm

Author: anarthal

example/CMakeLists.txt

@@ -17,9 +17,7 @@ endmacro()
 
 macro(make_testable_example EXAMPLE_NAME STANDARD)
   make_example(${EXAMPLE_NAME} ${STANDARD})
-  if (BOOST_REDIS_INTEGRATION_TESTS)
-    add_test(${EXAMPLE_NAME} ${EXAMPLE_NAME})
-  endif()
+  add_test(${EXAMPLE_NAME} ${EXAMPLE_NAME} $ENV{BOOST_REDIS_TEST_SERVER} 6379)
 endmacro()
 
 make_testable_example(cpp17_intro 17)
@@ -28,13 +26,13 @@ make_testable_example(cpp17_intro_sync 17)
 make_testable_example(cpp20_intro 20)
 make_testable_example(cpp20_containers 20)
 make_testable_example(cpp20_json 20)
-make_testable_example(cpp20_intro_tls 20)
 make_testable_example(cpp20_unix_sockets 20)
 
 make_example(cpp20_subscriber 20)
 make_example(cpp20_streams 20)
 make_example(cpp20_echo_server 20)
 make_example(cpp20_resolve_with_sentinel 20)
+make_example(cpp20_intro_tls 20)
 
 # We test the protobuf example only on gcc.
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

example/cpp17_spdlog.cpp

@@ -47,13 +47,8 @@ static void do_log(redis::logger::level level, std::string_view msg)
    spdlog::log(to_spdlog_level(level), "(Boost.Redis) {}", msg);
 }
 
-auto main(int argc, char* argv[]) -> int
+auto main(int argc, char** argv) -> int
 {
-   if (argc != 3) {
-      std::cerr << "Usage: " << argv[0] << " <server-host> <server-port>\n";
-      exit(1);
-   }
-
    try {
       // Create an execution context, required to create any I/O objects
       asio::io_context ioc;
@@ -67,10 +62,12 @@ auto main(int argc, char* argv[]) -> int
          redis::logger{redis::logger::level::info, do_log}
       };
 
-      // Configuration to connect to the server
+      // Configuration to connect to the server. Adjust as required
       redis::config cfg;
-      cfg.addr.host = argv[1];
-      cfg.addr.port = argv[2];
+      if (argc == 3) {
+         cfg.addr.host = argv[1];
+         cfg.addr.port = argv[2];
+      }
 
       // Run the connection with the specified configuration.
       // This will establish the connection and keep it healthy