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.
+  // Remove two directory levels from the path, i.e. a path like
+  // /absolute/path/src/out/Debug will become /absolute/path/src/
   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);
+    if (path_delimiter_index != std::string::npos) {
+      // Move up another directory in the directory tree. We should now be at
+      // the project root.
+      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 118 matching lines @@
     if (fseek(f, 0, SEEK_END) == 0) {
       size = ftell(f);
     }
     fclose(f);
   }
   return size;
 }
 
 }  // namespace test
 }  // namespace webrtc