Changed the way we find the ProjectRootPath.

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.
  */
 
 #include "webrtc/test/testsupport/fileutils.h"
 
 #include <assert.h>
 
 #ifdef WIN32
 #include <direct.h>
 #include <tchar.h>
 #include <windows.h>
 #include <algorithm>
 
+#include "Shlwapi.h"
+
 #include "webrtc/system_wrappers/include/utf_util_win.h"
 #define GET_CURRENT_DIR _getcwd
 #else
 #include <unistd.h>
 
 #define GET_CURRENT_DIR getcwd
 #endif
 
 #include <sys/stat.h>  // To check for directory existence.
 #ifndef S_ISDIR  // Not defined in stat.h on Windows.
@@ skipping 89 matching lines @@
 #else // WEBRTC_ANDROID
 
 std::string ProjectRootPath() {
 #if defined(WEBRTC_IOS)
   return IOSRootPath();
 #else
   std::string path = WorkingDir();
   if (path == kFallbackPath) {
     return kCannotFindProjectRootDir;
   }
-  if (relative_dir_path_set && strcmp(relative_dir_path, ".") != 0) {
+  if (relative_dir_path_set) {
     path = path + kPathDelimiter + relative_dir_path;
   }
-  // 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);
-  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;
-    }
+  path = path + kPathDelimiter + ".." + kPathDelimiter + "..";
+  char canonical_path[FILENAME_MAX];
+#ifdef WIN32
+  bool succeeded = PathCanonicalizeA(canonical_path, path.c_str());
+#else
+  bool succeeded = realpath(path.c_str(), canonical_path) != NULL;
+#endif
+  if (succeeded) {
+    path = std::string(canonical_path) + kPathDelimiter;
+    return path;
+  } else {
+    fprintf(stderr, "Cannot find project root directory!\n");
+    return kCannotFindProjectRootDir;
   }
-  fprintf(stderr, "Cannot find project root directory!\n");
-  return kCannotFindProjectRootDir;
 #endif
 }
 
 std::string OutputPath() {
 #if defined(WEBRTC_IOS)
   return IOSOutputPath();
 #else
   std::string path = ProjectRootPath();
   if (path == kCannotFindProjectRootDir) {
     return kFallbackPath;
@@ skipping 117 matching lines @@
     if (fseek(f, 0, SEEK_END) == 0) {
       size = ftell(f);
     }
     fclose(f);
   }
   return size;
 }
 
 }  // namespace test
 }  // namespace webrtc