| OLD | NEW |
| 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 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1005 command) | 1005 command) |
| 1006 result = _RunGTestCommand(command, extra_env, pipes=pipes, | 1006 result = _RunGTestCommand(command, extra_env, pipes=pipes, |
| 1007 results_tracker=results_tracker) | 1007 results_tracker=results_tracker) |
| 1008 finally: | 1008 finally: |
| 1009 if http_server: | 1009 if http_server: |
| 1010 http_server.StopServer() | 1010 http_server.StopServer() |
| 1011 if _UsingGtestJson(options): | 1011 if _UsingGtestJson(options): |
| 1012 _UploadGtestJsonSummary(json_file_name, | 1012 _UploadGtestJsonSummary(json_file_name, |
| 1013 options.build_properties, | 1013 options.build_properties, |
| 1014 test_exe) | 1014 test_exe) |
| 1015 results_tracker.ProcessJSONFile() | 1015 results_tracker.ProcessJSONFile(options.build_dir) |
| 1016 | 1016 |
| 1017 if options.generate_json_file: | 1017 if options.generate_json_file: |
| 1018 if not _GenerateJSONForTestResults(options, results_tracker): | 1018 if not _GenerateJSONForTestResults(options, results_tracker): |
| 1019 return 1 | 1019 return 1 |
| 1020 | 1020 |
| 1021 if options.annotate: | 1021 if options.annotate: |
| 1022 annotation_utils.annotate( | 1022 annotation_utils.annotate( |
| 1023 options.test_type, result, results_tracker, | 1023 options.test_type, result, results_tracker, |
| 1024 options.factory_properties.get('full_test_name'), | 1024 options.factory_properties.get('full_test_name'), |
| 1025 perf_dashboard_id=options.perf_dashboard_id) | 1025 perf_dashboard_id=options.perf_dashboard_id) |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1276 results_tracker=results_tracker) | 1276 results_tracker=results_tracker) |
| 1277 finally: | 1277 finally: |
| 1278 if http_server: | 1278 if http_server: |
| 1279 http_server.StopServer() | 1279 http_server.StopServer() |
| 1280 if start_xvfb: | 1280 if start_xvfb: |
| 1281 xvfb.StopVirtualX(slave_name) | 1281 xvfb.StopVirtualX(slave_name) |
| 1282 if _UsingGtestJson(options): | 1282 if _UsingGtestJson(options): |
| 1283 _UploadGtestJsonSummary(json_file_name, | 1283 _UploadGtestJsonSummary(json_file_name, |
| 1284 options.build_properties, | 1284 options.build_properties, |
| 1285 test_exe) | 1285 test_exe) |
| 1286 results_tracker.ProcessJSONFile() | 1286 results_tracker.ProcessJSONFile(options.build_dir) |
| 1287 | 1287 |
| 1288 if options.generate_json_file: | 1288 if options.generate_json_file: |
| 1289 if not _GenerateJSONForTestResults(options, results_tracker): | 1289 if not _GenerateJSONForTestResults(options, results_tracker): |
| 1290 return 1 | 1290 return 1 |
| 1291 | 1291 |
| 1292 if options.annotate: | 1292 if options.annotate: |
| 1293 annotation_utils.annotate( | 1293 annotation_utils.annotate( |
| 1294 options.test_type, result, results_tracker, | 1294 options.test_type, result, results_tracker, |
| 1295 options.factory_properties.get('full_test_name'), | 1295 options.factory_properties.get('full_test_name'), |
| 1296 perf_dashboard_id=options.perf_dashboard_id) | 1296 perf_dashboard_id=options.perf_dashboard_id) |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1395 command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options, | 1395 command = _GenerateRunIsolatedCommand(build_dir, test_exe_path, options, |
| 1396 command) | 1396 command) |
| 1397 result = _RunGTestCommand(command, extra_env, results_tracker) | 1397 result = _RunGTestCommand(command, extra_env, results_tracker) |
| 1398 finally: | 1398 finally: |
| 1399 if http_server: | 1399 if http_server: |
| 1400 http_server.StopServer() | 1400 http_server.StopServer() |
| 1401 if _UsingGtestJson(options): | 1401 if _UsingGtestJson(options): |
| 1402 _UploadGtestJsonSummary(json_file_name, | 1402 _UploadGtestJsonSummary(json_file_name, |
| 1403 options.build_properties, | 1403 options.build_properties, |
| 1404 test_exe) | 1404 test_exe) |
| 1405 results_tracker.ProcessJSONFile() | 1405 results_tracker.ProcessJSONFile(options.build_dir) |
| 1406 | 1406 |
| 1407 if options.enable_pageheap: | 1407 if options.enable_pageheap: |
| 1408 slave_utils.SetPageHeap(build_dir, 'chrome.exe', False) | 1408 slave_utils.SetPageHeap(build_dir, 'chrome.exe', False) |
| 1409 | 1409 |
| 1410 if options.generate_json_file: | 1410 if options.generate_json_file: |
| 1411 if not _GenerateJSONForTestResults(options, results_tracker): | 1411 if not _GenerateJSONForTestResults(options, results_tracker): |
| 1412 return 1 | 1412 return 1 |
| 1413 | 1413 |
| 1414 if options.annotate: | 1414 if options.annotate: |
| 1415 annotation_utils.annotate( | 1415 annotation_utils.annotate( |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1889 finally: | 1889 finally: |
| 1890 if did_launch_dbus: | 1890 if did_launch_dbus: |
| 1891 # It looks like the command line argument --exit-with-session | 1891 # It looks like the command line argument --exit-with-session |
| 1892 # isn't working to clean up the spawned dbus-daemon. Kill it | 1892 # isn't working to clean up the spawned dbus-daemon. Kill it |
| 1893 # manually. | 1893 # manually. |
| 1894 _ShutdownDBus() | 1894 _ShutdownDBus() |
| 1895 | 1895 |
| 1896 | 1896 |
| 1897 if '__main__' == __name__: | 1897 if '__main__' == __name__: |
| 1898 sys.exit(main()) | 1898 sys.exit(main()) |
| OLD | NEW |