mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-01-26 07:29:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated os::dir_name and tests

Browse Source
This commit is contained in:
gabime 2019-10-25 14:29:57 +03:00
parent 066087b383
commit a1f283946e
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
build-branch/example/logs2/basic-log.txt Normal file
View File

0
build-branch/tests/Debug/filename_2019-10-25 Normal file
View File

1
build-branch/tests/Debug/test_logs/custom_err2.txt Normal file
View File

@ -0,0 +1 @@
This is async handler error message

6
include/spdlog/details/os-inl.h
View File

@ -519,7 +519,11 @@ SPDLOG_INLINE bool create_dir(filename_t path)
// "abc" => "" // "abc" => ""
// "abc///" => "abc//" // "abc///" => "abc//"
SPDLOG_INLINE filename_t dir_name(filename_t path) SPDLOG_INLINE filename_t dir_name(filename_t path)
{ {
#ifdef _WIN32
// support forward slash in windows
std::replace(path.begin(), path.end(), '/', folder_sep);
#endif
auto pos = path.find_last_of(folder_sep); auto pos = path.find_last_of(folder_sep);
return pos != filename_t::npos ? path.substr(0, pos) : filename_t{}; return pos != filename_t::npos ? path.substr(0, pos) : filename_t{};
} }

33
tests/test_create_dir.cpp
View File

@ -6,12 +6,11 @@
using spdlog::details::os::create_dir; using spdlog::details::os::create_dir;
using spdlog::details::os::file_exists; using spdlog::details::os::file_exists;
void test_create_dir(const char *path, const char *normalized_path) bool try_create_dir(const char *path, const char *normalized_path)
{ {
printf("Test Create dir %s\n", path);
auto rv = create_dir(path); auto rv = create_dir(path);
REQUIRE(rv == true); REQUIRE(rv == true);
REQUIRE(file_exists(normalized_path)); return file_exists(normalized_path);
} }
#include "spdlog/sinks/stdout_color_sinks.h" #include "spdlog/sinks/stdout_color_sinks.h"
@ -19,23 +18,21 @@ void test_create_dir(const char *path, const char *normalized_path)
TEST_CASE("create_dir", "[create_dir]") TEST_CASE("create_dir", "[create_dir]")
{ {
prepare_logdir(); prepare_logdir();
REQUIRE(try_create_dir("test_logs/dir1/dir1", "test_logs/dir1/dir1"));
REQUIRE(try_create_dir("test_logs/dir1/dir1", "test_logs/dir1/dir1")); //test existing
REQUIRE(try_create_dir("test_logs/dir1///dir2//", "test_logs/dir1/dir2"));
REQUIRE(try_create_dir("./test_logs/dir1/dir3", "test_logs/dir1/dir3"));
REQUIRE(try_create_dir("test_logs/../test_logs/dir1/dir4", "test_logs/dir1/dir4"));
#ifdef WIN32 #ifdef WIN32
test_create_dir("test_logs/dir1/dir1", "test_logs\\dir1\\dir1");
test_create_dir("test_logs/dir1/dir1", "test_logs\\dir1\\dir1"); //test existing
test_create_dir("test_logs/dir1///dir2//", "test_logs\\dir1\\dir2");
test_create_dir("./test_logs/dir1/dir3", "test_logs\\dir1\\dir3");
test_create_dir("test_logs/../test_logs/dir1/dir4", "test_logs\\dir1\\dir4");
// test backslash // test backslash
test_create_dir("test_logs\\dir1\\dir222", "test_logs\\dir1\\dir222"); REQUIRE(try_create_dir("test_logs\\dir1\\dir222", "test_logs\\dir1\\dir222"));
test_create_dir("test_logs\\dir1\\dir223\\", "test_logs\\dir1\\dir223\\"); REQUIRE(try_create_dir("test_logs\\dir1\\dir223\\", "test_logs\\dir1\\dir223\\"));
test_create_dir(".\\test_logs\\dir1\\dir2\\dir99\\..\\dir23", "test_logs\\dir1\\dir2\\dir23"); REQUIRE(try_create_dir(".\\test_logs\\dir1\\dir2\\dir99\\..\\dir23", "test_logs\\dir1\\dir2\\dir23"));
#else REQUIRE(try_create_dir("test_logs\\..\\test_logs\\dir1\\dir5", "test_logs\\dir1\\dir5"));
test_create_dir("test_logs/dir1/dir1", "test_logs/dir1/dir1");
test_create_dir("test_logs/dir1/dir1", "test_logs/dir1/dir1"); // test existing
test_create_dir("test_logs/dir1///dir2", "test_logs/dir1/dir2");
test_create_dir("./test_logs/dir1/dir3", "test_logs/dir1/dir3");
test_create_dir("test_logs/../test_logs/dir1/dir4", "test_logs/dir1/dir4");
#endif #endif
} }
TEST_CASE("dir_name", "[create_dir]") TEST_CASE("dir_name", "[create_dir]")