Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FileLister: removed test-only recursiveAddFiles() overload #7241

Merged
merged 1 commit into from
Jan 22, 2025
Merged

FileLister: removed test-only recursiveAddFiles() overload #7241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions cli/filelister.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,6 @@ class FileWithDetails;
/** @brief Cross-platform FileLister */
class FileLister {
public:
/**
* @brief Recursively add source files to a map.
* Add source files from given directory and all subdirectries to the
* given map. Only files with accepted extensions
* (*.c;*.cpp;*.cxx;*.c++;*.cc;*.txx) are added.
* @param files output list that associates the size of each file with its name
* @param path root path
* @param ignored ignored paths
* @return On success, an empty string is returned. On error, a error message is returned.
*/
static std::string recursiveAddFiles(std::list<FileWithDetails> &files, const std::string &path, const PathMatch& ignored) {
const std::set<std::string> extra;
return recursiveAddFiles(files, path, extra, ignored);
}

/**
* @brief Recursively add source files to a map.
* Add source files from given directory and all subdirectries to the
Expand Down
8 changes: 4 additions & 4 deletions test/testfilelister.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TestFileLister : public TestFixture {
std::list<FileWithDetails> files;
std::vector<std::string> masks;
PathMatch matcher(std::move(masks));
std::string err = FileLister::recursiveAddFiles(files, adddir, matcher);
std::string err = FileLister::recursiveAddFiles(files, adddir, {}, matcher);
ASSERT_EQUALS("", err);

ASSERT(!files.empty());
Expand Down Expand Up @@ -108,7 +108,7 @@ class TestFileLister : public TestFixture {

void recursiveAddFilesEmptyPath() const {
std::list<FileWithDetails> files;
const std::string err = FileLister::recursiveAddFiles(files, "", PathMatch({}));
const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch({}));
ASSERT_EQUALS("no path specified", err);
}

Expand All @@ -118,7 +118,7 @@ class TestFileLister : public TestFixture {
std::list<FileWithDetails> files;
std::vector<std::string> ignored{"lib/token.cpp"};
PathMatch matcher(ignored);
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", matcher);
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
ASSERT_EQUALS("", err);
ASSERT(files.empty());
}
Expand All @@ -129,7 +129,7 @@ class TestFileLister : public TestFixture {
std::list<FileWithDetails> files;
std::vector<std::string> ignored;
PathMatch matcher(ignored);
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", matcher);
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
ASSERT_EQUALS("", err);
ASSERT_EQUALS(1, files.size());
ASSERT_EQUALS(basedir + "lib/token.cpp", files.begin()->path());
Expand Down
Loading