summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/base_paths.h1
-rw-r--r--base/base_unittests.scons1
-rw-r--r--base/build/base_unittests.vcproj4
-rw-r--r--base/perf_test_suite.h50
-rw-r--r--base/perftimer.cc5
-rw-r--r--base/perftimer.h3
-rw-r--r--base/process_util_unittest.cc6
-rw-r--r--base/run_all_perftests.cc35
-rw-r--r--base/run_all_unittests.cc2
-rw-r--r--base/test_suite.h18
10 files changed, 84 insertions, 41 deletions
diff --git a/base/base_paths.h b/base/base_paths.h
index 3992d62..0f29f56 100644
--- a/base/base_paths.h
+++ b/base/base_paths.h
@@ -16,6 +16,7 @@
#elif defined(OS_LINUX)
#include "base/base_paths_linux.h"
#endif
+#include "base/path_service.h"
namespace base {
diff --git a/base/base_unittests.scons b/base/base_unittests.scons
index 3dd851e..f3ed327 100644
--- a/base/base_unittests.scons
+++ b/base/base_unittests.scons
@@ -50,6 +50,7 @@ input_files = ChromeFileList([
MSVSFilter('support', [
'multiprocess_test.h',
'no_windows2000_unittest.h',
+ 'perf_test_suite.h',
'run_all_unittests.cc',
'test_suite.h',
]),
diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj
index eb148d5..945c8dd 100644
--- a/base/build/base_unittests.vcproj
+++ b/base/build/base_unittests.vcproj
@@ -152,6 +152,10 @@
>
</File>
<File
+ RelativePath="..\perf_test_suite.h"
+ >
+ </File>
+ <File
RelativePath="..\run_all_unittests.cc"
>
</File>
diff --git a/base/perf_test_suite.h b/base/perf_test_suite.h
new file mode 100644
index 0000000..bab7904
--- /dev/null
+++ b/base/perf_test_suite.h
@@ -0,0 +1,50 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_PERF_TEST_SUITE_H_
+#define BASE_PERF_TEST_SUITE_H_
+
+#include "base/command_line.h"
+#include "base/debug_util.h"
+#include "base/file_path.h"
+#include "base/perftimer.h"
+#include "base/process_util.h"
+#include "base/string_util.h"
+#include "base/test_suite.h"
+
+class PerfTestSuite : public TestSuite {
+ public:
+ PerfTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
+ }
+
+ virtual void Initialize() {
+ // Initialize the perf timer log
+ FilePath log_path;
+ std::wstring log_file = CommandLine().GetSwitchValue(L"log-file");
+ if (log_file.empty()) {
+ FilePath exe;
+ PathService::Get(base::FILE_EXE, &exe);
+ log_path = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
+ log_path = log_path.InsertBeforeExtension(FILE_PATH_LITERAL("_perf"));
+ } else {
+ log_path = FilePath::FromWStringHack(log_file);
+ }
+ ASSERT_TRUE(InitPerfLog(log_path));
+
+ // Raise to high priority to have more precise measurements. Since we don't
+ // aim at 1% precision, it is not necessary to run at realtime level.
+ if (!DebugUtil::BeingDebugged())
+ base::RaiseProcessToHighPriority();
+
+ TestSuite::Initialize();
+ }
+
+ virtual void Shutdown() {
+ TestSuite::Shutdown();
+
+ FinalizePerfLog();
+ }
+};
+
+#endif // BASE_PERF_TEST_SUITE_H_
diff --git a/base/perftimer.cc b/base/perftimer.cc
index 9fc0328..4c64c5e 100644
--- a/base/perftimer.cc
+++ b/base/perftimer.cc
@@ -8,19 +8,20 @@
#include <string>
#include "base/basictypes.h"
+#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
static FILE* perf_log_file = NULL;
-bool InitPerfLog(const char* log_file) {
+bool InitPerfLog(const FilePath& log_file) {
if (perf_log_file) {
// trying to initialize twice
NOTREACHED();
return false;
}
- perf_log_file = file_util::OpenFile(std::string(log_file), "w");
+ perf_log_file = file_util::OpenFile(log_file, "w");
return perf_log_file != NULL;
}
diff --git a/base/perftimer.h b/base/perftimer.h
index 9558697..81009dd 100644
--- a/base/perftimer.h
+++ b/base/perftimer.h
@@ -7,6 +7,7 @@
#include <string>
#include "base/basictypes.h"
+#include "base/file_path.h"
#include "base/time.h"
// ----------------------------------------------------------------------
@@ -14,7 +15,7 @@
// called at the beginning and end (respectively) of running all the
// performance tests. The init function returns true on success.
// ----------------------------------------------------------------------
-bool InitPerfLog(const char* log_file);
+bool InitPerfLog(const FilePath& log_path);
void FinalizePerfLog();
// ----------------------------------------------------------------------
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 5723a83..a6eb8a7 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -158,11 +158,13 @@ MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess) {
}
}
+ // 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;
- num_open_files -= expected_num_open_fds;
+ expected_num_open_fds += 1;
#endif // defined(OS_LINUX)
+ num_open_files -= expected_num_open_fds;
write(write_pipe, &num_open_files, sizeof(num_open_files));
close(write_pipe);
diff --git a/base/run_all_perftests.cc b/base/run_all_perftests.cc
index c0b91c1..84ed48f 100644
--- a/base/run_all_perftests.cc
+++ b/base/run_all_perftests.cc
@@ -2,40 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/command_line.h"
-#include "base/debug_util.h"
-#include "base/perftimer.h"
-#include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/test_suite.h"
-
-class PerfTestSuite : public TestSuite {
- public:
- PerfTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
- }
-
- virtual void Initialize() {
- // Initialize the perf timer log
- std::string log_file =
- WideToUTF8(CommandLine().GetSwitchValue(L"log-file"));
- if (log_file.empty())
- log_file = "perf_test.log";
- ASSERT_TRUE(InitPerfLog(log_file.c_str()));
-
- // Raise to high priority to have more precise measurements. Since we don't
- // aim at 1% precision, it is not necessary to run at realtime level.
- if (!DebugUtil::BeingDebugged())
- base::RaiseProcessToHighPriority();
-
- TestSuite::Initialize();
- }
-
- virtual void Shutdown() {
- TestSuite::Shutdown();
-
- FinalizePerfLog();
- }
-};
+#include "base/perf_test_suite.h"
int main(int argc, char** argv) {
return PerfTestSuite(argc, argv).Run();
diff --git a/base/run_all_unittests.cc b/base/run_all_unittests.cc
index e7c7b37..d9f6b58 100644
--- a/base/run_all_unittests.cc
+++ b/base/run_all_unittests.cc
@@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/process_util.h"
#include "base/test_suite.h"
int main(int argc, char** argv) {
- base::EnableTerminationOnHeapCorruption();
return TestSuite(argc, argv).Run();
}
diff --git a/base/test_suite.h b/base/test_suite.h
index 1c0a785..a9f05b2 100644
--- a/base/test_suite.h
+++ b/base/test_suite.h
@@ -10,11 +10,14 @@
// any gtest based tests that are linked into your executable.
#include "base/at_exit.h"
+#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/debug_on_start.h"
+#include "base/file_path.h"
#include "base/icu_util.h"
#include "base/logging.h"
#include "base/multiprocess_test.h"
+#include "base/scoped_nsautorelease_pool.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
@@ -27,16 +30,31 @@
class TestSuite {
public:
TestSuite(int argc, char** argv) {
+ base::ScopedNSAutoreleasePool scoped_pool;
+
+ base::EnableTerminationOnHeapCorruption();
CommandLine::SetArgcArgv(argc, argv);
testing::InitGoogleTest(&argc, argv);
#if defined(OS_LINUX)
gtk_init_check(&argc, &argv);
#endif
+
+ FilePath exe;
+ PathService::Get(base::FILE_EXE, &exe);
+ FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
+ logging::InitLogging(log_filename.value().c_str(),
+ logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
+ logging::LOCK_LOG_FILE,
+ logging::DELETE_OLD_LOG_FILE);
+ // we want process and thread IDs because we may have multiple processes
+ logging::SetLogItems(true, true, false, true);
}
virtual ~TestSuite() {}
int Run() {
+ base::ScopedNSAutoreleasePool scoped_pool;
+
Initialize();
std::wstring client_func = CommandLine().GetSwitchValue(kRunClientProcess);
// Check to see if we are being run as a client process.
generated by cgit v1.1 at 2025-01-22 12:47:17 +0000