ReadDirectory() added in webrtc/test/testsupport/fileutils.h

webrtc/test/testsupport/fileutils.h

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <stdio.h>
 
 #ifndef WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
 #define WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
 
 #include <string>
+#include <vector>
 
 namespace webrtc {
 namespace test {
 
 // This is the "directory" returned if the ProjectPath() function fails
 // to find the project root.
 extern const char* kCannotFindProjectRootDir;
 
 // Creates and returns the absolute path to the output directory where log files
 // and other test artifacts should be put. The output directory is generally a
@@ skipping 32 matching lines @@
 //           hierarchy reflecting that path is assumed to be present.
 //    extension - File extension, without the dot, i.e. "bmp" or "yuv".
 std::string ResourcePath(const std::string& name,
                          const std::string& extension);
 
 // Gets the current working directory for the executing program.
 // Returns "./" if for some reason it is not possible to find the working
 // directory.
 std::string WorkingDir();
 
+// Reads the content of a directory, clears |output| and adds a string in it for
+// each found file or directory. Each entry is a path created by prepending
+// |dir| to the file/directory name. Returns true if no error occurs. "." and
+// ".." are never added in |output|.
+bool ReadDirectory(std::string path, std::vector<std::string>* output);

[kwiberg-webrtc, 2017/05/29 12:11:36]

Should the first argument be const std::string&? The function implementation
will not typically move from |path|, right?

Document the return value. Is it a success/fail boolean?

Consider returning Optional<vector<string>> instead of using an output argument,
since this is test code where clarity trumps performance.

[AleBzk, 2017/05/29 13:04:48]

Nope, I need a local copy to add a trailing / (or \) if missing.
Done.
Done.

[kwiberg-webrtc, 2017/05/30 08:28:12]

OK, that makes sense.

[AleBzk, 2017/05/30 11:09:16]

Acknowledged.

+
 // Creates a directory if it not already exists.
 // Returns true if successful. Will print an error message to stderr and return
 // false if a file with the same name already exists.
 bool CreateDir(const std::string& directory_name);
 
 // Removes a directory, which must already be empty.
 bool RemoveDir(const std::string& directory_name);
 
 // Removes a file.
 bool RemoveFile(const std::string& file_name);
@@ skipping 13 matching lines @@
 // but can also be an absolute path. The intention with this function is to pass
 // the argv[0] being sent into the main function to make it possible for
 // fileutils.h to find the correct project paths even when the working directory
 // is outside the project tree (which happens in some cases).
 void SetExecutablePath(const std::string& path_to_executable);
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_