Assume ProjectRootPath() equals ../.. in Desktop

webrtc/test/testsupport/fileutils.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 41 matching lines @@
 
 #ifdef WIN32
 const char* kPathDelimiter = "\\";
 #else
 const char* kPathDelimiter = "/";
 #endif
 
 #ifdef WEBRTC_ANDROID
 const char* kRootDirName = "/sdcard/chromium_tests_root/";
 #else
-// The file we're looking for to identify the project root dir.
-const char* kProjectRootFileName = "DEPS";
 #if !defined(WEBRTC_IOS)
 const char* kOutputDirName = "out";
 #endif
 const char* kFallbackPath = "./";
 #endif  // !defined(WEBRTC_ANDROID)
 
 #if !defined(WEBRTC_IOS)
 const char* kResourcesDirName = "resources";
 #endif
 
@@ skipping 44 matching lines @@
   return kRootDirName;
 }
 
 #else // WEBRTC_ANDROID
 
 std::string ProjectRootPath() {
   std::string path = WorkingDir();
   if (path == kFallbackPath) {
     return kCannotFindProjectRootDir;
   }
-  if (relative_dir_path_set) {
+  if (relative_dir_path_set && strcmp(relative_dir_path, ".") != 0) {
     path = path + kPathDelimiter + relative_dir_path;
   }
   // Check for our file that verifies the root dir.

[kjellander_webrtc, 2016/09/15 06:28:32]

We don't check for a file anymore, do we? I suggest remove it.

[kjellander_webrtc, 2016/09/15 06:28:33]

I think a comment phrased something like this is suitable here:

// Remove two directory levels from the path, i.e. a path like
/absolute/path/src/out/Debug/
// will become /absolute/path/src/

[ehmaldonado_webrtc, 2016/09/15 08:23:15]

Done.

   size_t path_delimiter_index = path.find_last_of(kPathDelimiter);
-  while (path_delimiter_index != std::string::npos) {
-    std::string root_filename = path + kPathDelimiter + kProjectRootFileName;
-    if (FileExists(root_filename)) {
-      return path + kPathDelimiter;
-    }
+  if (path_delimiter_index != std::string::npos) {
     // Move up one directory in the directory tree.
     path = path.substr(0, path_delimiter_index);
     path_delimiter_index = path.find_last_of(kPathDelimiter);
+    // Check for our file that verifies the root dir.

[kjellander_webrtc, 2016/09/15 06:28:33]

Remove this comment, it's just confusing.

[ehmaldonado_webrtc, 2016/09/15 08:23:15]

Done.

+    size_t path_delimiter_index = path.find_last_of(kPathDelimiter);

[kjellander_webrtc, 2016/09/15 06:28:33]

Does this even compile? It seems you're declaring the same variable a second
time.

[ehmaldonado_webrtc, 2016/09/15 08:23:15]

Yes, it compiles, and it works. I think maybe it was shadowing the previous
declaration.
I've removed this line.

+    if (path_delimiter_index != std::string::npos) {
+      // Move up one directory in the directory tree.

[kjellander_webrtc, 2016/09/15 06:28:32]

Change to:
// Move up another directory level in the directory tree (should now be at the
root).

[ehmaldonado_webrtc, 2016/09/15 08:23:15]

Done.

+      return path.substr(0, path_delimiter_index) + kPathDelimiter;
+    }
   }
-  // Reached the root directory.
   fprintf(stderr, "Cannot find project root directory!\n");
   return kCannotFindProjectRootDir;
 }
 
 std::string OutputPath() {
 #if defined(WEBRTC_IOS)
   return IOSOutputPath();
 #else
   std::string path = ProjectRootPath();
   if (path == kCannotFindProjectRootDir) {
@@ skipping 100 matching lines @@
   if (FileExists(resource_file)) {
     return resource_file;
   }
   // Try without platform.
   resource_file = resources_path + name + "_" + architecture + "." + extension;
   if (FileExists(resource_file)) {
     return resource_file;
   }
 
   // Fall back on name without architecture or platform.
+  resource_file = resources_path + name + "." + extension;
+  FileExists(resource_file);
   return resources_path + name + "." + extension;

[kjellander_webrtc, 2016/09/15 06:28:33]

return resource_file;

[ehmaldonado_webrtc, 2016/09/15 08:23:15]

I'm leaving this unchanged. Those two lines were for debugging purposes and I'd
forgot to remove them.

[kjellander_webrtc, 2016/09/15 10:04:49]

Acknowledged.

 #endif  // defined (WEBRTC_IOS)
 }
 
 size_t GetFileSize(std::string filename) {
   FILE* f = fopen(filename.c_str(), "rb");
   size_t size = 0;
   if (f != NULL) {
     if (fseek(f, 0, SEEK_END) == 0) {
       size = ftell(f);
     }
     fclose(f);
   }
   return size;
 }
 
 }  // namespace test
 }  // namespace webrtc