Fixed widows tests

This commit is contained in:
gabime 2019-09-15 20:56:20 +03:00
parent c53d26cfca
commit adc4398cc5
2 changed files with 3 additions and 3 deletions

View File

@ -135,7 +135,6 @@ static void test_rotate(int days_to_run, uint16_t max_days, uint16_t expected_n_
TEST_CASE("daily_logger rotate", "[daily_file_sink]") TEST_CASE("daily_logger rotate", "[daily_file_sink]")
{ {
int days_to_run = 1; int days_to_run = 1;
test_rotate(days_to_run, 0, 1); test_rotate(days_to_run, 0, 1);
test_rotate(days_to_run, 1, 1); test_rotate(days_to_run, 1, 1);

View File

@ -80,12 +80,13 @@ std::size_t count_files(const std::string &folder)
HANDLE hFind = INVALID_HANDLE_VALUE; HANDLE hFind = INVALID_HANDLE_VALUE;
// Start iterating over the files in the path directory. // Start iterating over the files in the path directory.
hFind = ::FindFirstFileA(folder.c_str(), &ffd); hFind = ::FindFirstFileA((folder + "\\*.*").c_str(), &ffd);
if (hFind != INVALID_HANDLE_VALUE) if (hFind != INVALID_HANDLE_VALUE)
{ {
do // Managed to locate and create an handle to that folder. do // Managed to locate and create an handle to that folder.
{ {
counter++; if (ffd.cFileName[0] != '.')
counter++;
} while (::FindNextFile(hFind, &ffd) == TRUE); } while (::FindNextFile(hFind, &ffd) == TRUE);
::FindClose(hFind); ::FindClose(hFind);
} }