| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 | 2 |
| 3 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 3 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 4 # | 4 # |
| 5 # Use of this source code is governed by a BSD-style license | 5 # Use of this source code is governed by a BSD-style license |
| 6 # that can be found in the LICENSE file in the root of the source | 6 # that can be found in the LICENSE file in the root of the source |
| 7 # tree. An additional intellectual property rights grant can be found | 7 # tree. An additional intellectual property rights grant can be found |
| 8 # in the file PATENTS. All contributing project authors may | 8 # in the file PATENTS. All contributing project authors may |
| 9 # be found in the AUTHORS file in the root of the source tree. | 9 # be found in the AUTHORS file in the root of the source tree. |
| 10 | 10 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 ] + gtest_parallel_args | 136 ] + gtest_parallel_args |
| 137 | 137 |
| 138 print 'gtest-parallel-wrapper: Executing command %s' % ' '.join(command) | 138 print 'gtest-parallel-wrapper: Executing command %s' % ' '.join(command) |
| 139 sys.stdout.flush() | 139 sys.stdout.flush() |
| 140 | 140 |
| 141 exit_code = subprocess.call(command, env=test_env, cwd=os.getcwd()) | 141 exit_code = subprocess.call(command, env=test_env, cwd=os.getcwd()) |
| 142 | 142 |
| 143 output_dir = get_output_dir(gtest_parallel_args) | 143 output_dir = get_output_dir(gtest_parallel_args) |
| 144 if output_dir: | 144 if output_dir: |
| 145 for test_status in 'passed', 'failed', 'interrupted': | 145 for test_status in 'passed', 'failed', 'interrupted': |
| 146 logs_dir = os.path.join(output_dir, test_status) | 146 logs_dir = os.path.join(output_dir, 'gtest-parallel-logs', test_status) |
| 147 if not os.path.isdir(logs_dir): | 147 if not os.path.isdir(logs_dir): |
| 148 continue | 148 continue |
| 149 logs = [os.path.join(logs_dir, log) for log in os.listdir(logs_dir)] | 149 logs = [os.path.join(logs_dir, log) for log in os.listdir(logs_dir)] |
| 150 log_file = os.path.join(output_dir, '%s-tests.log' % test_status) | 150 log_file = os.path.join(output_dir, '%s-tests.log' % test_status) |
| 151 CatFiles(logs, log_file) | 151 CatFiles(logs, log_file) |
| 152 os.rmdir(logs_dir) | 152 os.rmdir(logs_dir) |
| 153 | 153 |
| 154 return exit_code | 154 return exit_code |
| 155 | 155 |
| 156 | 156 |
| 157 if __name__ == '__main__': | 157 if __name__ == '__main__': |
| 158 sys.exit(main()) | 158 sys.exit(main()) |
| OLD | NEW |