summaryrefslogtreecommitdiffstats
path: root/o3d/utils
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 11:19:33 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 11:19:33 +0000
commitfabdd008ce9bc6847f66c7e8fc0c878fc3dc6614 (patch)
tree3c7b0c996c37d07877a0df66de61ef34d6dbf319 /o3d/utils
parentff1674a5bbf4d6f3349ae574c110abe1d66a9522 (diff)
downloadchromium_src-fabdd008ce9bc6847f66c7e8fc0c878fc3dc6614.zip
chromium_src-fabdd008ce9bc6847f66c7e8fc0c878fc3dc6614.tar.gz
chromium_src-fabdd008ce9bc6847f66c7e8fc0c878fc3dc6614.tar.bz2
TBR=gspencer@google.com
Fix for mac/linux for FindFile test. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/utils')
-rw-r--r--o3d/utils/cross/file_path_utils_test.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/o3d/utils/cross/file_path_utils_test.cc b/o3d/utils/cross/file_path_utils_test.cc
index e5b9ede..ce96165 100644
--- a/o3d/utils/cross/file_path_utils_test.cc
+++ b/o3d/utils/cross/file_path_utils_test.cc
@@ -214,9 +214,11 @@ TEST_F(FilePathUtilsTest, FindFile) {
FilePath expected_path_1(folder_path_1);
expected_path_1 = expected_path_1.Append(file_path_1);
+ o3d::AbsolutePath(&expected_path_1);
FilePath expected_path_2(folder_path_2);
expected_path_2 =
expected_path_2.Append(UTF8ToFilePath("tga-256x256-32bit.tga"));
+ o3d::AbsolutePath(&expected_path_2);
std::vector<FilePath> paths;
EXPECT_FALSE(FindFile(paths, file_path_1, &out_path));