summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authortommycli <tommycli@chromium.org>2014-11-19 16:05:57 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-20 00:06:19 +0000
commit90a150fcb844f82fb60a4936ef4c6a45002c142c (patch)
treee1adabaf2f3c978886f1bc23d774a8a61972c56c /tools/perf
parent57abf3fc95678673e074a584e1e3ec31c121cf3c (diff)
downloadchromium_src-90a150fcb844f82fb60a4936ef4c6a45002c142c.zip
chromium_src-90a150fcb844f82fb60a4936ef4c6a45002c142c.tar.gz
chromium_src-90a150fcb844f82fb60a4936ef4c6a45002c142c.tar.bz2
Revert of Attempt #4 to convert telemetry to the typ framework. (patchset #2 id:20001 of https://codereview.chromium.org/743463003/)
Reason for revert: Sorry, this broke the bot: http://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/16871 Original issue's description: > Attempt #4 to convert telemetry to the typ framework. > > This switches telemetry to use the typ python testing framework, > which should allow us to run tests in parallel. > > The prior attempt was foiled by tools/chrome_proxy not having been > updated; this attempt includes that change. > > R=dtu@chromium.org > BUG=388256 > = > > Committed: https://crrev.com/9af6a9ac4b74e30551554793991a1e99db82aa66 > Cr-Commit-Position: refs/heads/master@{#304878} TBR=dtu@chromium.org,dpranke@chromium.org NOTREECHECKS=true NOTRY=true BUG=388256 Review URL: https://codereview.chromium.org/730183003 Cr-Commit-Position: refs/heads/master@{#304935}
Diffstat (limited to 'tools/perf')
-rwxr-xr-xtools/perf/run_tests22
1 files changed, 9 insertions, 13 deletions
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index ee83552..0f1f2dd 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -9,21 +9,17 @@ This script DOES NOT run benchmarks. run_benchmark does that.
"""
import os
-import subprocess
import sys
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
-if __name__ == '__main__':
- perf_dir = os.path.dirname(os.path.realpath(__file__))
- telemetry_dir = os.path.realpath(os.path.join(perf_dir, '..', 'telemetry'))
+from telemetry.unittest_util import gtest_progress_reporter
+from telemetry.unittest_util import run_tests
- env = os.environ.copy()
- if 'PYTHONPATH' in env:
- env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + telemetry_dir
- else:
- env['PYTHONPATH'] = telemetry_dir
- path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util',
- 'run_tests.py')
- argv = ['--top-level-dir', perf_dir] + sys.argv[1:]
- sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env))
+if __name__ == '__main__':
+ base_dir = os.path.dirname(os.path.realpath(__file__))
+ progress_reporters = [
+ gtest_progress_reporter.GTestProgressReporter(sys.stdout)]
+ run_tests.config = run_tests.Config(base_dir, [base_dir], progress_reporters)
+ sys.exit(run_tests.RunTestsCommand.main())