Bump fmt to version 8.1.1 and run clang-format

This commit is contained in:
gabime
2022-02-12 13:20:15 +02:00
parent d8199b607d
commit c432fdd987
11 changed files with 94 additions and 109 deletions

View File

@@ -110,7 +110,7 @@ TEST_CASE("file_event_handlers", "[file_helper]")
after_close
};
prepare_logdir();
spdlog::filename_t test_filename = SPDLOG_FILENAME_T(TEST_FILENAME);
// define event handles that update vector of flags when called
std::vector<flags> events;
@@ -119,13 +119,13 @@ TEST_CASE("file_event_handlers", "[file_helper]")
REQUIRE(filename == test_filename);
events.push_back(flags::before_open);
};
handlers.after_open = [&](spdlog::filename_t filename, std::FILE* fstream) {
handlers.after_open = [&](spdlog::filename_t filename, std::FILE *fstream) {
REQUIRE(filename == test_filename);
REQUIRE(fstream);
fputs("after_open\n", fstream);
events.push_back(flags::after_open);
};
handlers.before_close = [&](spdlog::filename_t filename, std::FILE* fstream) {
handlers.before_close = [&](spdlog::filename_t filename, std::FILE *fstream) {
REQUIRE(filename == test_filename);
REQUIRE(fstream);
fputs("before_close\n", fstream);
@@ -141,17 +141,16 @@ TEST_CASE("file_event_handlers", "[file_helper]")
helper.open(test_filename);
REQUIRE(events == std::vector<flags>{flags::before_open, flags::after_open});
events.clear();
helper.close();
events.clear();
helper.close();
REQUIRE(events == std::vector<flags>{flags::before_close, flags::after_close});
REQUIRE(file_contents(TEST_FILENAME) == "after_open\nbefore_close\n");
helper.reopen(true);
events.clear();
events.clear();
}
// make sure that the file_helper destrcutor calls the close callbacks if needed
// make sure that the file_helper destrcutor calls the close callbacks if needed
REQUIRE(events == std::vector<flags>{flags::before_close, flags::after_close});
REQUIRE(file_contents(TEST_FILENAME) == "after_open\nbefore_close\n");
}

View File

@@ -27,7 +27,7 @@ TEST_CASE("debug and trace w/o format string", "[macros]]")
using spdlog::details::os::default_eol;
REQUIRE(ends_with(file_contents(TEST_FILENAME), spdlog::fmt_lib::format("Test message 2{}", default_eol)));
REQUIRE(count_lines(TEST_FILENAME) == 1);
auto orig_default_logger = spdlog::default_logger();
spdlog::set_default_logger(logger);
@@ -52,4 +52,3 @@ TEST_CASE("pass logger pointer", "[macros]")
SPDLOG_LOGGER_TRACE(&ref, "Test message 1");
SPDLOG_LOGGER_DEBUG(&ref, "Test message 2");
}