summaryrefslogtreecommitdiffstats
path: root/tools/perf/run_tests
diff options
context:
space:
mode:
authordtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-16 22:28:27 +0000
committerdtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-16 22:28:27 +0000
commitaee50e84293e34ee609fad03cc21ed29cce9c27e (patch)
treef927991f11034d14a0e1151927c132bd14a62381 /tools/perf/run_tests
parent5bd51d18f81c3da489ec5e03ce6886bc52fbd99b (diff)
downloadchromium_src-aee50e84293e34ee609fad03cc21ed29cce9c27e.zip
chromium_src-aee50e84293e34ee609fad03cc21ed29cce9c27e.tar.gz
chromium_src-aee50e84293e34ee609fad03cc21ed29cce9c27e.tar.bz2
[Telemetry] Reorganize everything.
Split telemetry into 4 main directories: telemetry/core - stuff for dealing with options, browsers, tabs, extensions, credentials. should never reference anything in page. telemetry/core/chrome - chrome's implementation of core. should never be referenced outside of core. telemetry/page - actions, and basically everything with the word page in its name. telemetry/test - stuff related to testing, unit testing, discovery. TBR=nduca@chromium.org BUG=168429 TEST=./run_tests in telemetry and perf. There are preexisting failures in telemetry. Also ./run_multipage_benchmarks. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182991 Review URL: https://codereview.chromium.org/12278015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf/run_tests')
-rwxr-xr-xtools/perf/run_tests16
1 files changed, 6 insertions, 10 deletions
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index 0ec9c71..d7d7891 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -12,21 +12,17 @@ import os
import sys
import perf_tools
-import telemetry.gtest_testrunner
-import telemetry.run_tests
+from telemetry.test import gtest_testrunner
+from telemetry.test import run_tests
if __name__ == '__main__':
- top_level_dir = os.path.abspath(
- os.path.dirname(__file__))
- runner = telemetry.gtest_testrunner.GTestTestRunner(
- print_result_after_run=False)
+ top_level_dir = os.path.abspath(os.path.dirname(__file__))
+ runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False)
start_dir = 'perf_tools'
- ret = telemetry.run_tests.Main(
- sys.argv[1:], start_dir, top_level_dir, runner)
+ ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner)
start_dir = 'page_sets'
- ret = ret + telemetry.run_tests.Main(
- sys.argv[1:], start_dir, top_level_dir, runner)
+ ret = ret + run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner)
runner.result.PrintSummary()