0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Log a warning if a file is found in more than one [binary_path]

Browse source 
The Boost-based C++ unit tests generate three messages about duplicates,
however as those tests don't run in strict mode this doesn't cause a
failure (and it's not the only warning-level message in those tests).
This commit is contained in:
Steve Cotton 2019-12-20 23:28:57 +01:00
parent b0a79e6e9f
commit 0bbbdff190
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/filesystem_boost.cpp
View file

@ -1356,6 +1356,7 @@ std::string get_binary_file_location(const std::string& type, const std::string&
return std::string();
}
std::string result;
for(const std::string& bp : get_binary_paths(type)) {
bfs::path bpath(bp);
bpath /= filename;
@ -1364,12 +1365,17 @@ std::string get_binary_file_location(const std::string& type, const std::string&
if(file_exists(bpath)) {
DBG_FS << " found at '" << bpath.string() << "'\n";
return bpath.string();
if(result.empty()) {
result = bpath.string();
} else {
WRN_FS << "Conflicting files in binary_path: '" << sanitize_path(result)
<< "' and '" << sanitize_path(bpath.string()) << "'\n";
}
}
}
DBG_FS << " not found\n";
return std::string();
return result;
}
std::string get_binary_dir_location(const std::string& type, const std::string& filename)

3
src/tests/test_filesystem.cpp
View file

@ -142,6 +142,9 @@ BOOST_AUTO_TEST_CASE( test_fs_binary_path )
{
BOOST_CHECK_EQUAL( get_binary_dir_location("images", "."), gamedata + "/images/." );
// This test depends on get_binary_file_location() deterministically choosing
// which order to search the [binary_path] entries, as there are four "images"
// directories that could match.
BOOST_CHECK_EQUAL( get_binary_file_location("images", "././././././"),
gamedata + "/images/././././././" );