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

Side by Side Diff: scripts/slave/runtest.py

Issue 634933002: Enable telemetry --output-format=chartjson in recipes builds (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 6 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 | « no previous file | no next file » | 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 (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 """A tool used to run a Chrome test executable and process the output. 6 """A tool used to run a Chrome test executable and process the output.
7 7
8 This script is used by the buildbot slaves. It must be run from the outer 8 This script is used by the buildbot slaves. It must be run from the outer
9 build directory, e.g. chrome-release/build/. 9 build directory, e.g. chrome-release/build/.
10 10
(...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 Ensures that --output=chartjson is set and adds a --output argument. 1576 Ensures that --output=chartjson is set and adds a --output argument.
1577 1577
1578 Arguments: 1578 Arguments:
1579 args: list of command line arguments, starts with 'run_benchmark' for 1579 args: list of command line arguments, starts with 'run_benchmark' for
1580 telemetry tests. 1580 telemetry tests.
1581 1581
1582 Returns: 1582 Returns:
1583 None if not a telemetry test, otherwise a 1583 None if not a telemetry test, otherwise a
1584 dict containing the output filename and whether it is a reference build. 1584 dict containing the output filename and whether it is a reference build.
1585 """ 1585 """
1586 # TODO(sullivan): remove this line to enable new telemetry chartjson.
1587 # W0101: unreachable code. Disable this check until we're able to remove this
1588 # line entirely.
1589 # pylint: disable=W0101
1590 return {}
1591 if not args[0].endswith('run_benchmark'): 1586 if not args[0].endswith('run_benchmark'):
1592 # Not a telemetry run 1587 # Not a telemetry run
1593 return None 1588 return None
1594 1589
1595 is_ref = '--browser=reference' in args 1590 is_ref = '--browser=reference' in args
1596 1591
1597 if '--output-format=buildbot' in args: 1592 if '--output-format=buildbot' in args:
1598 args[args.index('--output-format=buildbot')] = '--output-format=chartjson' 1593 args[args.index('--output-format=buildbot')] = '--output-format=chartjson'
1599 # Using NamedTemporaryFile instead of mkstemp because of windows issues 1594 # Using NamedTemporaryFile instead of mkstemp because of windows issues
1600 # with mkstemp. 1595 # with mkstemp.
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
2006 finally: 2001 finally:
2007 if did_launch_dbus: 2002 if did_launch_dbus:
2008 # It looks like the command line argument --exit-with-session 2003 # It looks like the command line argument --exit-with-session
2009 # isn't working to clean up the spawned dbus-daemon. Kill it 2004 # isn't working to clean up the spawned dbus-daemon. Kill it
2010 # manually. 2005 # manually.
2011 _ShutdownDBus() 2006 _ShutdownDBus()
2012 2007
2013 2008
2014 if '__main__' == __name__: 2009 if '__main__' == __name__:
2015 sys.exit(main()) 2010 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698