diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 20:03:54 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 20:03:54 +0000 |
commit | 1ecbf13615d89a0e0369cab2e70692d5b9a46341 (patch) | |
tree | 8938e0f033cb69a1ef1c4b009396bec20c4e623a /chrome/test/perf | |
parent | 91a55b979b98d4dd69c7dcf61bc408ae230efab1 (diff) | |
download | chromium_src-1ecbf13615d89a0e0369cab2e70692d5b9a46341.zip chromium_src-1ecbf13615d89a0e0369cab2e70692d5b9a46341.tar.gz chromium_src-1ecbf13615d89a0e0369cab2e70692d5b9a46341.tar.bz2 |
Port flush_cache tool and perf_tests.
BUG=4160,4263
Review URL: http://codereview.chromium.org/9639
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r-- | chrome/test/perf/perftests.cc | 9 | ||||
-rw-r--r-- | chrome/test/perf/perftests.scons | 68 |
2 files changed, 38 insertions, 39 deletions
diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc index 3e67a6b..18d92aa 100644 --- a/chrome/test/perf/perftests.cc +++ b/chrome/test/perf/perftests.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/at_exit.h" +#include "base/command_line.h" +#include "base/debug_util.h" #include "base/message_loop.h" #include "base/perftimer.h" #include "base/process_util.h" @@ -11,7 +14,9 @@ // TODO(darin): share code with base/run_all_perftests.cc int main(int argc, char **argv) { + base::AtExitManager exit_manager; base::EnableTerminationOnHeapCorruption(); + CommandLine::SetArgcArgv(argc, argv); chrome::RegisterPathProvider(); MessageLoop main_message_loop; @@ -43,8 +48,8 @@ int main(int argc, char **argv) { // 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 (!IsDebuggerPresent()) { - SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); + if (!DebugUtil::BeingDebugged()) { + base::RaiseProcessToHighPriority(); } int result = RUN_ALL_TESTS(); diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons index d93f4a6..c089027 100644 --- a/chrome/test/perf/perftests.scons +++ b/chrome/test/perf/perftests.scons @@ -1,29 +1,22 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Copyright (c) 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. +__doc__ = """ +Configuration for building the perf_tests{,.exe} executable. +""" + Import('env') env = env.Clone() env.ApplySConscript([ - '$BASE_DIR/gfx/using_base_gfx.scons', '$BASE_DIR/using_base.scons', - '$BZIP2_DIR/using_bzip2.scons', - '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', + '$NET_DIR/using_net.scons', '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$CHROME_SRC_DIR/build/using_v8.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$LIBXML_DIR/using_libxml.scons', - '$LIBXSLT_DIR/using_libxslt.scons', '$MODP_B64_DIR/using_modp_b64.scons', - '$NET_DIR/using_net.scons', - '$SDCH_DIR/using_sdch.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', ]) env.Prepend( @@ -31,35 +24,16 @@ env.Prepend( 'PERF_TEST', ], LIBS = [ - 'activex_shim', 'browser', - 'browser_views', 'common', - 'debugger', - 'default_plugin', - 'glue', - 'JavaScriptCore_pcre', - 'plugin', - 'port', - 'renderer', 'sqlite', - 'util', - 'v8_snapshot', - 'V8Bindings', - 'views', - 'WebCore', - 'WTF', ], ) -if env['PLATFORM'] == 'win32': - env.Prepend( - LIBS = [ - 'rpcrt4', - 'shlwapi', - 'winmm', - ], - ) +if env['PLATFORM'] in ('posix', 'darwin'): + env.SConscript([ + '$LIBEVENT_DIR/using_libevent.scons', + ], {'env':env}) input_files = [ 'perftests.cc', @@ -71,4 +45,24 @@ input_files = [ '$CHROME_DIR/common/json_value_serializer_perftest.cc', ] -env.ChromeTestProgram('perf_tests', input_files) +if env['PLATFORM'] == 'win32': + env.Prepend( + LIBS = [ + 'rpcrt4', + 'shlwapi', + 'winmm', + ] + ) + +if env['PLATFORM'] != 'win32': + # TODO(port): Port these files. + remove_files = [ + 'url_parse_perftest.cc', + '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', + '$CHROME_DIR/browser/visitedlink_perftest.cc', + ] + for file in remove_files: + input_files.remove(file) + +if env['PLATFORM'] in ('posix', 'win32'): + env.ChromeTestProgram('perf_tests', input_files) |