GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-11 02:36:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #12, fixed small issue with new recursive_directory_iterator tests on Windows due to not comparing generic format.

Browse Source
This commit is contained in:
Steffen Schümann 2019-05-04 09:16:36 +02:00
parent e8ced30a84
commit da215a8c96
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/filesystem_test.cpp
View File

@ -1224,7 +1224,7 @@ TEST_CASE("30.10.14 class recursive_directory_iterator", "[filesystem][recursive
auto iter = fs::recursive_directory_iterator("."); auto iter = fs::recursive_directory_iterator(".");
std::multimap<std::string, int> result; std::multimap<std::string, int> result;
while(iter != fs::recursive_directory_iterator()) { while(iter != fs::recursive_directory_iterator()) {
result.insert(std::make_pair(iter->path().string(), iter.depth())); result.insert(std::make_pair(iter->path().generic_string(), iter.depth()));
++iter; ++iter;
} }
std::stringstream os; std::stringstream os;
@ -1243,7 +1243,7 @@ TEST_CASE("30.10.14 class recursive_directory_iterator", "[filesystem][recursive
auto iter = fs::recursive_directory_iterator("."); auto iter = fs::recursive_directory_iterator(".");
std::multimap<std::string, int> result; std::multimap<std::string, int> result;
while(iter != fs::recursive_directory_iterator()) { while(iter != fs::recursive_directory_iterator()) {
result.insert(std::make_pair(iter->path().string(), iter.depth())); result.insert(std::make_pair(iter->path().generic_string(), iter.depth()));
if(iter->path() == "./d1/d2") { if(iter->path() == "./d1/d2") {
iter.disable_recursion_pending(); iter.disable_recursion_pending();
} }
@ -1265,7 +1265,7 @@ TEST_CASE("30.10.14 class recursive_directory_iterator", "[filesystem][recursive
auto iter = fs::recursive_directory_iterator("."); auto iter = fs::recursive_directory_iterator(".");
std::multimap<std::string, int> result; std::multimap<std::string, int> result;
while(iter != fs::recursive_directory_iterator()) { while(iter != fs::recursive_directory_iterator()) {
result.insert(std::make_pair(iter->path().string(), iter.depth())); result.insert(std::make_pair(iter->path().generic_string(), iter.depth()));
if(iter->path() == "./d1/d2") { if(iter->path() == "./d1/d2") {
iter.pop(); iter.pop();
} }