diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 11:47:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:03 +0100 |
| commit | dc0f95d653279beabeb9817299e2902918ba123e (patch) | |
| tree | 32eb121cd532053a5b9cb0c390331349af8d6baa /base/process_util_unittest.cc | |
| parent | ba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff) | |
| download | external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2 | |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'base/process_util_unittest.cc')
| -rw-r--r-- | base/process_util_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 1b7368a..31e1dec 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -658,12 +658,12 @@ TEST_F(ProcessUtilTest, GetAppOutputRestrictedNoZombies) { } } -#if defined(OS_LINUX) TEST_F(ProcessUtilTest, GetParentProcessId) { base::ProcessId ppid = base::GetParentProcessId(base::GetCurrentProcId()); EXPECT_EQ(ppid, getppid()); } +#if defined(OS_LINUX) TEST_F(ProcessUtilTest, ParseProcStatCPU) { // /proc/self/stat for a process running "top". const char kTopStat[] = "960 (top) S 16230 960 16230 34818 960 " @@ -683,7 +683,7 @@ TEST_F(ProcessUtilTest, ParseProcStatCPU) { EXPECT_EQ(0, base::ParseProcStatCPU(kSelfStat)); } -#endif +#endif // defined(OS_LINUX) #endif // defined(OS_POSIX) |