summaryrefslogtreecommitdiffstats
path: root/base/file_util_unittest.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 00:32:52 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 00:32:52 +0000
commite43eddf1a5887c4b249af3daa024c1107ce254a1 (patch)
tree994df09c627978ef3fb93a9fadebd00bebbcb31d /base/file_util_unittest.cc
parenta672cb9dce10306f3b149802653dbb554b326a44 (diff)
downloadchromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.zip
chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.gz
chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.bz2
Changes to base/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/495002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_unittest.cc')
-rw-r--r--base/file_util_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 200c386..35233ba 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1373,19 +1373,19 @@ TEST_F(FileUtilTest, Contains) {
EXPECT_FALSE(file_util::ContainsPath(foo, foobar));
EXPECT_FALSE(file_util::ContainsPath(foo, foo));
-// Platform-specific concerns
+ // Platform-specific concerns.
FilePath foo_caps(data_dir.Append(FILE_PATH_LITERAL("FOO")));
#if defined(OS_WIN)
EXPECT_TRUE(file_util::ContainsPath(foo,
foo_caps.Append(FILE_PATH_LITERAL("bar.txt"))));
EXPECT_TRUE(file_util::ContainsPath(foo,
FilePath(foo.value() + FILE_PATH_LITERAL("/bar.txt"))));
-#elif defined(OS_LINUX)
+#elif defined(OS_MACOSX)
+ // We can't really do this test on OS X since the case-sensitivity of the
+ // filesystem is configurable.
+#elif defined(OS_POSIX)
EXPECT_FALSE(file_util::ContainsPath(foo,
foo_caps.Append(FILE_PATH_LITERAL("bar.txt"))));
-#else
- // We can't really do this test on osx since the case-sensitivity of the
- // filesystem is configurable.
#endif
}