| Index: webrtc/test/testsupport/fileutils.h
|
| diff --git a/webrtc/test/testsupport/fileutils.h b/webrtc/test/testsupport/fileutils.h
|
| index 482b1874a7f0fd2f8655bef0cbaa1fe1b48b347c..2467f0c8e54a8717f824a58df8c9bf1c2fbcbcc6 100644
|
| --- a/webrtc/test/testsupport/fileutils.h
|
| +++ b/webrtc/test/testsupport/fileutils.h
|
| @@ -10,57 +10,6 @@
|
|
|
| #include <stdio.h>
|
|
|
| -// File utilities for testing purposes.
|
| -//
|
| -// The ProjectRootPath() method is a convenient way of getting an absolute
|
| -// path to the project source tree root directory. Using this, it is easy to
|
| -// refer to test resource files in a portable way.
|
| -//
|
| -// Notice that even if Windows platforms use backslash as path delimiter, it is
|
| -// also supported to use slash, so there's no need for #ifdef checks in test
|
| -// code for setting up the paths to the resource files.
|
| -//
|
| -// Example use:
|
| -// Assume we have the following code being used in a test source file:
|
| -// const std::string kInputFile = webrtc::test::ProjectRootPath() +
|
| -// "test/data/voice_engine/audio_long16.wav";
|
| -// // Use the kInputFile for the tests...
|
| -//
|
| -// Then here's some example outputs for different platforms:
|
| -// Linux:
|
| -// * Source tree located in /home/user/webrtc/trunk
|
| -// * Test project located in /home/user/webrtc/trunk/src/testproject
|
| -// * Test binary compiled as:
|
| -// /home/user/webrtc/trunk/out/Debug/testproject_unittests
|
| -// Then ProjectRootPath() will return /home/user/webrtc/trunk/ no matter if
|
| -// the test binary is executed from standing in either of:
|
| -// /home/user/webrtc/trunk
|
| -// or
|
| -// /home/user/webrtc/trunk/out/Debug
|
| -// (or any other directory below the trunk for that matter).
|
| -//
|
| -// Windows:
|
| -// * Source tree located in C:\Users\user\webrtc\trunk
|
| -// * Test project located in C:\Users\user\webrtc\trunk\src\testproject
|
| -// * Test binary compiled as:
|
| -// C:\Users\user\webrtc\trunk\src\testproject\Debug\testproject_unittests.exe
|
| -// Then ProjectRootPath() will return C:\Users\user\webrtc\trunk\ when the
|
| -// test binary is executed from inside Visual Studio.
|
| -// It will also return the same path if the test is executed from a command
|
| -// prompt standing in C:\Users\user\webrtc\trunk\src\testproject\Debug
|
| -//
|
| -// Mac:
|
| -// * Source tree located in /Users/user/webrtc/trunk
|
| -// * Test project located in /Users/user/webrtc/trunk/src/testproject
|
| -// * Test binary compiled as:
|
| -// /Users/user/webrtc/trunk/xcodebuild/Debug/testproject_unittests
|
| -// Then ProjectRootPath() will return /Users/user/webrtc/trunk/ no matter if
|
| -// the test binary is executed from standing in either of:
|
| -// /Users/user/webrtc/trunk
|
| -// or
|
| -// /Users/user/webrtc/trunk/out/Debug
|
| -// (or any other directory below the trunk for that matter).
|
| -
|
| #ifndef WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
|
| #define WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
|
|
|
| @@ -73,32 +22,14 @@ namespace test {
|
| // to find the project root.
|
| extern const char* kCannotFindProjectRootDir;
|
|
|
| -// Finds the root dir of the project, to be able to set correct paths to
|
| -// resource files used by tests.
|
| -// For desktop, we assume that the project root is two levels above (i.e. the
|
| -// current working directory + /../../)
|
| -// For Android, it is assumed to be /sdcard/chromium_tests_root/
|
| -// For iOS, the resource files are assumed to be included in the test's .app
|
| -// bundle.
|
| -// If the current working directory is above the project root dir, it will not
|
| -// be found.
|
| -//
|
| -// If symbolic links occur in the path they will be resolved and the actual
|
| -// directory will be returned.
|
| -//
|
| -// Returns the absolute path to the project root dir (usually the trunk dir)
|
| -// WITH a trailing path delimiter.
|
| -// If the project root is not found, the string specified by
|
| -// kCannotFindProjectRootDir is returned.
|
| -std::string ProjectRootPath();
|
| -
|
| // 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
|
| // directory named "out" at the top-level of the project, i.e. a subfolder to
|
| // the path returned by ProjectRootPath(). The exception is Android where we use
|
| // /sdcard/ instead.
|
| //
|
| -// Details described for ProjectRootPath() apply here too.
|
| +// If symbolic links occur in the path they will be resolved and the actual
|
| +// directory will be returned.
|
| //
|
| // Returns the path WITH a trailing path delimiter. If the project root is not
|
| // found, the current working directory ("./") is returned as a fallback.
|
|
|