Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: tools/chrome_proxy/run_measurement

Issue 397483002: Move chrome_proxy tests from under tools/perf to tools/chrome_proxy/integration_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated tools/perf/run_tests to include chrome_proxy tests. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import os 6 import os
7 import sys 7 import sys
8 8
9 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) 9 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
10 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'perf'))
10 11
11 from telemetry import test_runner 12 from telemetry import test_runner
12 from telemetry.core import environment 13 from telemetry.core import environment
13 from telemetry.core import util 14 from telemetry.core import util
14 from telemetry.util import bootstrap 15 from telemetry.util import bootstrap
15 16
16 17
17 CROS_BOOSTRAP_DEPS_PATH = os.path.join( 18 CROS_BOOSTRAP_DEPS_PATH = os.path.join(
18 util.GetChromiumSrcDir(), 'tools', 'cros', 'bootstrap_deps') 19 util.GetChromiumSrcDir(), 'tools', 'cros', 'bootstrap_deps')
19 20
20 21
21 def main(): 22 def main():
22 if '--print-bootstrap-deps-cros' in sys.argv: 23 if '--print-bootstrap-deps-cros' in sys.argv:
23 print bootstrap.ListAllDepsPaths(CROS_BOOSTRAP_DEPS_PATH) 24 print bootstrap.ListAllDepsPaths(CROS_BOOSTRAP_DEPS_PATH)
24 return 0 25 return 0
25 26
26 base_dir = os.path.dirname(os.path.realpath(__file__)) 27 base_dir = os.path.dirname(os.path.realpath(__file__))
27 test_runner.config = environment.Environment([base_dir]) 28 test_runner.config = environment.Environment([base_dir])
28 sys.exit(test_runner.main()) 29 sys.exit(test_runner.main())
29 30
30 31
31 if __name__ == '__main__': 32 if __name__ == '__main__':
32 sys.exit(main()) 33 sys.exit(main())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698