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

Side by Side Diff: content/test/gpu/run_gpu_test.py

Issue 1369213004: Revert of Add crash_service to Telemetry's isolates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fck
Patch Set: Created 5 years, 2 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
« no previous file with comments | « content/telemetry_gpu_unittests.isolate ('k') | content/test/gpu/run_unittests.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 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 re 7 import re
8 import subprocess 8 import subprocess
9 import sys 9 import sys
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 # way that this variable sticks around from run to run. 80 # way that this variable sticks around from run to run.
81 if 'DBUS_SESSION_BUS_ADDRESS' in os.environ: 81 if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
82 del os.environ['DBUS_SESSION_BUS_ADDRESS'] 82 del os.environ['DBUS_SESSION_BUS_ADDRESS']
83 print ' cleared DBUS_SESSION_BUS_ADDRESS environment variable' 83 print ' cleared DBUS_SESSION_BUS_ADDRESS environment variable'
84 84
85 85
86 if __name__ == '__main__': 86 if __name__ == '__main__':
87 top_level_dir = os.path.dirname(os.path.realpath(__file__)) 87 top_level_dir = os.path.dirname(os.path.realpath(__file__))
88 config = benchmark_runner.ProjectConfig( 88 config = benchmark_runner.ProjectConfig(
89 top_level_dir=top_level_dir, 89 top_level_dir=top_level_dir,
90 benchmark_dirs=[os.path.join(top_level_dir, 'gpu_tests')], 90 benchmark_dirs=[os.path.join(top_level_dir, 'gpu_tests')])
91 client_config=os.path.abspath(os.path.join(
92 top_level_dir, os.pardir, os.pardir, os.pardir, 'tools', 'perf',
93 'core', 'binary_dependencies.json')))
94 91
95 did_launch_dbus = _LaunchDBus() 92 did_launch_dbus = _LaunchDBus()
96 try: 93 try:
97 retcode = benchmark_runner.main(config) 94 retcode = benchmark_runner.main(config)
98 finally: 95 finally:
99 if did_launch_dbus: 96 if did_launch_dbus:
100 _ShutdownDBus() 97 _ShutdownDBus()
101 98
102 sys.exit(retcode) 99 sys.exit(retcode)
OLDNEW
« no previous file with comments | « content/telemetry_gpu_unittests.isolate ('k') | content/test/gpu/run_unittests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698