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

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

Issue 633393003: Disable chartjson while investigating crbug.com/423034 (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 1566 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 Ensures that --output=chartjson is set and adds a --output argument. 1577 Ensures that --output=chartjson is set and adds a --output argument.
1578 1578
1579 Arguments: 1579 Arguments:
1580 args: list of command line arguments, starts with 'run_benchmark' for 1580 args: list of command line arguments, starts with 'run_benchmark' for
1581 telemetry tests. 1581 telemetry tests.
1582 1582
1583 Returns: 1583 Returns:
1584 None if not a telemetry test, otherwise a 1584 None if not a telemetry test, otherwise a
1585 dict containing the output filename and whether it is a reference build. 1585 dict containing the output filename and whether it is a reference build.
1586 """ 1586 """
1587 # Temporarily revert while investigating crbug.com/423034
1588 # pylint: disable=W0101
1589 return {}
1587 if not args[0].endswith('run_benchmark'): 1590 if not args[0].endswith('run_benchmark'):
1588 # Not a telemetry run 1591 # Not a telemetry run
1589 return None 1592 return None
1590 1593
1591 is_ref = '--browser=reference' in args 1594 is_ref = '--browser=reference' in args
1592 1595
1593 if '--output-format=buildbot' in args: 1596 if '--output-format=buildbot' in args:
1594 args[args.index('--output-format=buildbot')] = '--output-format=chartjson' 1597 args[args.index('--output-format=buildbot')] = '--output-format=chartjson'
1595 # Using NamedTemporaryFile instead of mkstemp because of windows issues 1598 # Using NamedTemporaryFile instead of mkstemp because of windows issues
1596 # with mkstemp. 1599 # with mkstemp.
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
2009 finally: 2012 finally:
2010 if did_launch_dbus: 2013 if did_launch_dbus:
2011 # It looks like the command line argument --exit-with-session 2014 # It looks like the command line argument --exit-with-session
2012 # isn't working to clean up the spawned dbus-daemon. Kill it 2015 # isn't working to clean up the spawned dbus-daemon. Kill it
2013 # manually. 2016 # manually.
2014 _ShutdownDBus() 2017 _ShutdownDBus()
2015 2018
2016 2019
2017 if '__main__' == __name__: 2020 if '__main__' == __name__:
2018 sys.exit(main()) 2021 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