diff options
| author | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 22:59:23 +0000 |
|---|---|---|
| committer | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 22:59:23 +0000 |
| commit | 45f93cb92b530646f49e4419ad5a51c3528019ba (patch) | |
| tree | 5ac62c980e954f82b02e5c168b8f873ea7c97b1f /tools | |
| parent | 62abcbfbbe1683f2564dc15ef911c58b890b07b7 (diff) | |
| download | chromium_src-45f93cb92b530646f49e4419ad5a51c3528019ba.zip chromium_src-45f93cb92b530646f49e4419ad5a51c3528019ba.tar.gz chromium_src-45f93cb92b530646f49e4419ad5a51c3528019ba.tar.bz2 | |
[telemetry] Fix perf/run_tests after r239318.
perf_tools no longer exists, so remove the import.
Previously, importing perf_tools would implicitly add telemetry to our sys.path, but now we have to do it explicitly. This is a Good Thing.
BUG=311380
TEST=tools/telemetry/run_tests; tools/perf/run_tests.
TBR=tonyg
Review URL: https://codereview.chromium.org/108193010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/perf/run_tests | 5 | ||||
| -rwxr-xr-x | tools/telemetry/run_tests | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/perf/run_tests b/tools/perf/run_tests index 45761f6..77a5366 100755 --- a/tools/perf/run_tests +++ b/tools/perf/run_tests @@ -2,6 +2,7 @@ # Copyright 2013 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. + """This script runs unit tests of the code in the perf directory. This script DOES NOT run benchmarks. run_benchmarks and run_measurement do that. @@ -10,11 +11,11 @@ This script DOES NOT run benchmarks. run_benchmarks and run_measurement do that. import os import sys -import measurements -import perf_tools +sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) from telemetry.unittest import gtest_testrunner from telemetry.unittest import run_tests + if __name__ == '__main__': top_level_dir = os.path.abspath(os.path.dirname(__file__)) runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False) diff --git a/tools/telemetry/run_tests b/tools/telemetry/run_tests index d02a0a7..e5c13e9 100755 --- a/tools/telemetry/run_tests +++ b/tools/telemetry/run_tests @@ -2,17 +2,18 @@ # Copyright (c) 2012 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. + import os import sys from telemetry.unittest import gtest_testrunner from telemetry.unittest import run_tests + if __name__ == '__main__': top_level_dir = os.path.abspath(os.path.dirname(__file__)) runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False) - start_dir = os.path.join(top_level_dir, 'telemetry') - ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner) + ret = run_tests.Main(sys.argv[1:], top_level_dir, top_level_dir, runner) if runner.result: runner.result.PrintSummary() |