diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 02:38:01 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 02:38:01 +0000 |
| commit | 3bafceff128e66ff24a4b7c1f66bddf5e6e6a18d (patch) | |
| tree | ea924bcd1d452e48853fd33c67a6c4773dd934b5 /tools | |
| parent | 038ee5832afe51afab9ce2b54f52fb744c9b8443 (diff) | |
| download | chromium_src-3bafceff128e66ff24a4b7c1f66bddf5e6e6a18d.zip chromium_src-3bafceff128e66ff24a4b7c1f66bddf5e6e6a18d.tar.gz chromium_src-3bafceff128e66ff24a4b7c1f66bddf5e6e6a18d.tar.bz2 | |
Revert of https://codereview.chromium.org/108193010/
Reason for revert: autoupdate_EndToEndTest failures
TBR=tonyg@chromium.org,dtu@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/107163006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240515 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, 4 insertions, 6 deletions
diff --git a/tools/perf/run_tests b/tools/perf/run_tests index 77a5366..45761f6 100755 --- a/tools/perf/run_tests +++ b/tools/perf/run_tests @@ -2,7 +2,6 @@ # 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. @@ -11,11 +10,11 @@ This script DOES NOT run benchmarks. run_benchmarks and run_measurement do that. import os import sys -sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) +import measurements +import perf_tools 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 e5c13e9..d02a0a7 100755 --- a/tools/telemetry/run_tests +++ b/tools/telemetry/run_tests @@ -2,18 +2,17 @@ # 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) - ret = run_tests.Main(sys.argv[1:], top_level_dir, top_level_dir, runner) + start_dir = os.path.join(top_level_dir, 'telemetry') + ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner) if runner.result: runner.result.PrintSummary() |