Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1021)

Unified Diff: base/process_util_unittest.cc

Issue 18003: Call logging::InitLogging. The lack of this was causing some hangs (and poss... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/perftimer.cc ('k') | base/run_all_perftests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process_util_unittest.cc
===================================================================
--- base/process_util_unittest.cc (revision 7931)
+++ base/process_util_unittest.cc (working copy)
@@ -159,11 +159,13 @@
}
}
+ // InitLogging always opens a file at startup.
+ int expected_num_open_fds = 1;
#if defined(OS_LINUX)
// On Linux, '/etc/localtime' is opened before the test's main() enters.
- const int expected_num_open_fds = 1;
+ expected_num_open_fds += 1;
+#endif // defined(OS_LINUX)
num_open_files -= expected_num_open_fds;
-#endif // defined(OS_LINUX)
write(write_pipe, &num_open_files, sizeof(num_open_files));
close(write_pipe);
« no previous file with comments | « base/perftimer.cc ('k') | base/run_all_perftests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698