diff options
author | leecam <leecam@chromium.org> | 2015-02-20 11:23:01 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 19:23:53 +0000 |
commit | 5a50fdd84f42a4df08cced9d792985336b5335a4 (patch) | |
tree | 22bf4158847680e50eb47a9b7c61bde224b08782 | |
parent | dbb423240e720c74ecc4a677d95d28d6c16ac9e1 (diff) | |
download | chromium_src-5a50fdd84f42a4df08cced9d792985336b5335a4.zip chromium_src-5a50fdd84f42a4df08cced9d792985336b5335a4.tar.gz chromium_src-5a50fdd84f42a4df08cced9d792985336b5335a4.tar.bz2 |
sandbox: Change directory names in ProcUtil test to support Android
The ProcUtil tests HasOpenDirectory HasOpenDirectoryWithFD use
/dev to test HasOpenDirectory. /dev fails to open on Android
due to SELinux. This change picks /proc/self instead, which
will work on all linux platforms.
BUG=459360
TEST=sandbox_linux_unittests
Review URL: https://codereview.chromium.org/939723003
Cr-Commit-Position: refs/heads/master@{#317366}
-rw-r--r-- | sandbox/linux/services/proc_util_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sandbox/linux/services/proc_util_unittest.cc b/sandbox/linux/services/proc_util_unittest.cc index ee36c83..2bf37a0 100644 --- a/sandbox/linux/services/proc_util_unittest.cc +++ b/sandbox/linux/services/proc_util_unittest.cc @@ -28,9 +28,9 @@ TEST(ProcUtil, HasOpenDirectory) { // No open directory should exist at startup. EXPECT_FALSE(ProcUtil::HasOpenDirectory(-1)); { - // Have a "/dev" file descriptor around. - int dev_fd = open("/dev", O_RDONLY | O_DIRECTORY); - base::ScopedFD dev_fd_closer(dev_fd); + // Have a "/proc" file descriptor around. + int proc_fd = open("/proc", O_RDONLY | O_DIRECTORY); + base::ScopedFD proc_fd_closer(proc_fd); EXPECT_TRUE(ProcUtil::HasOpenDirectory(-1)); } EXPECT_FALSE(ProcUtil::HasOpenDirectory(-1)); @@ -48,14 +48,14 @@ TEST(ProcUtil, HasOpenDirectoryWithFD) { EXPECT_FALSE(ProcUtil::HasOpenDirectory(proc_fd)); { - // Have a "/dev" file descriptor around. - int dev_fd = open("/dev", O_RDONLY | O_DIRECTORY); - base::ScopedFD dev_fd_closer(dev_fd); + // Have a directory file descriptor around. + int open_directory_fd = open("/proc/self", O_RDONLY | O_DIRECTORY); + base::ScopedFD open_directory_fd_closer(open_directory_fd); EXPECT_TRUE(ProcUtil::HasOpenDirectory(proc_fd)); } - // The "/dev" file descriptor should now be closed, |proc_fd| is the only - // directory file descriptor open. + // The "/proc/self" file descriptor should now be closed, |proc_fd| is the + // only directory file descriptor open. EXPECT_FALSE(ProcUtil::HasOpenDirectory(proc_fd)); } |