Upgrade to fmt 5.x
This commit is contained in:
		@@ -26,13 +26,8 @@ TEST_CASE("default_error_handler", "[errors]]")
 | 
			
		||||
 | 
			
		||||
    auto logger = spdlog::create<spdlog::sinks::simple_file_sink_mt>("test-error", filename, true);
 | 
			
		||||
    logger->set_pattern("%v");
 | 
			
		||||
#if !defined(SPDLOG_FMT_PRINTF)
 | 
			
		||||
    logger->info("Test message {} {}", 1);
 | 
			
		||||
    logger->info("Test message {}", 2);
 | 
			
		||||
#else
 | 
			
		||||
    logger->info("Test message %d %d", 1);
 | 
			
		||||
    logger->info("Test message %d", 2);
 | 
			
		||||
#endif
 | 
			
		||||
    logger->flush();
 | 
			
		||||
 | 
			
		||||
    REQUIRE(file_contents(filename) == std::string("Test message 2\n"));
 | 
			
		||||
@@ -50,11 +45,8 @@ TEST_CASE("custom_error_handler", "[errors]]")
 | 
			
		||||
    logger->flush_on(spdlog::level::info);
 | 
			
		||||
    logger->set_error_handler([=](const std::string &) { throw custom_ex(); });
 | 
			
		||||
    logger->info("Good message #1");
 | 
			
		||||
#if !defined(SPDLOG_FMT_PRINTF)
 | 
			
		||||
 | 
			
		||||
    REQUIRE_THROWS_AS(logger->info("Bad format msg {} {}", "xxx"), custom_ex);
 | 
			
		||||
#else
 | 
			
		||||
    REQUIRE_THROWS_AS(logger->info("Bad format msg %s %s", "xxx"), custom_ex);
 | 
			
		||||
#endif
 | 
			
		||||
    logger->info("Good message #2");
 | 
			
		||||
    REQUIRE(count_lines(filename) == 2);
 | 
			
		||||
}
 | 
			
		||||
@@ -91,11 +83,7 @@ TEST_CASE("async_error_handler", "[errors]]")
 | 
			
		||||
            ofs << err_msg;
 | 
			
		||||
        });
 | 
			
		||||
        logger->info("Good message #1");
 | 
			
		||||
#if !defined(SPDLOG_FMT_PRINTF)
 | 
			
		||||
        logger->info("Bad format msg {} {}", "xxx");
 | 
			
		||||
#else
 | 
			
		||||
        logger->info("Bad format msg %s %s", "xxx");
 | 
			
		||||
#endif
 | 
			
		||||
        logger->info("Good message #2");
 | 
			
		||||
        spdlog::drop("logger"); // force logger to drain the queue and shutdown
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user