gtest-parallel: Concatenate the log files in the passed, failed and interrupted dirs.
BUG=webrtc:7391
R=kjellander@webrtc.org
NOTRY=True
Review-Url: https://codereview.webrtc.org/2787453004
Cr-Commit-Position: refs/heads/master@{#17468}
diff --git a/tools-webrtc/gtest-parallel-wrapper.py b/tools-webrtc/gtest-parallel-wrapper.py
index c9718e2..0a31f63 100755
--- a/tools-webrtc/gtest-parallel-wrapper.py
+++ b/tools-webrtc/gtest-parallel-wrapper.py
@@ -42,66 +42,91 @@
import subprocess
import sys
-# GTEST_SHARD_INDEX and GTEST_TOTAL_SHARDS must be removed from the environment
-# otherwise it will be picked up by the binary, causing a bug where only tests
-# in the firsh shard are executed.
-test_env = os.environ.copy()
-gtest_shard_index = test_env.pop('GTEST_SHARD_INDEX', '0')
-gtest_total_shards = test_env.pop('GTEST_TOTAL_SHARDS', '1')
-webrtc_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-gtest_parallel_path = os.path.join(webrtc_root, 'third_party', 'gtest-parallel',
- 'gtest-parallel')
+def cat_files(file_list, output_file):
+ with open(output_file, 'w') as output_file:
+ for filename in file_list:
+ with open(filename) as input_file:
+ output_file.write(input_file.read())
+ os.remove(filename)
-# Ignore '--'. Options unprocessed by this script will be passed to the test as
-# arguments.
-if '--' in sys.argv:
- del sys.argv[sys.argv.index('--')]
-parser = argparse.ArgumentParser()
-parser.add_argument('--isolated-script-test-output', type=str, default=None)
-parser.add_argument('--output_dir', type=str, default=None)
-parser.add_argument('--timeout', type=int, default=None)
+def main():
+ # Ignore '--'. Options unprocessed by this script will be passed to the test
+ # as arguments.
+ if '--' in sys.argv:
+ del sys.argv[sys.argv.index('--')]
-options, unprocessed = parser.parse_known_args()
-test_executable = unprocessed[0]
-test_arguments = unprocessed[1:]
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--isolated-script-test-output', type=str, default=None)
+ parser.add_argument('--output_dir', type=str, default=None)
+ parser.add_argument('--timeout', type=int, default=None)
-gtest_args = [
- test_executable,
- '--shard_count',
- gtest_total_shards,
- '--shard_index',
- gtest_shard_index,
-]
+ # GTEST_SHARD_INDEX and GTEST_TOTAL_SHARDS must be removed from the
+ # environment. Otherwise it will be picked up by the binary, causing a bug
+ # where only tests in the first shard are executed.
+ test_env = os.environ.copy()
+ gtest_shard_index = test_env.pop('GTEST_SHARD_INDEX', '0')
+ gtest_total_shards = test_env.pop('GTEST_TOTAL_SHARDS', '1')
-# --isolated-script-test-output is used to upload results to the flakiness
-# dashboard. This translation is made because gtest-parallel expects the flag to
-# be called --dump_json_test_results instead.
-if options.isolated_script_test_output:
- gtest_args += [
- '--dump_json_test_results',
- options.isolated_script_test_output,
+ webrtc_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+ gtest_parallel_path = os.path.join(
+ webrtc_root, 'third_party', 'gtest-parallel', 'gtest-parallel')
+
+ options, unprocessed = parser.parse_known_args()
+ test_executable = unprocessed[0]
+ test_arguments = unprocessed[1:]
+
+ gtest_args = [
+ test_executable,
+ '--shard_count',
+ gtest_total_shards,
+ '--shard_index',
+ gtest_shard_index,
]
-if options.output_dir:
- gtest_args += [
- '--output_dir',
- options.output_dir,
- ]
+ # --isolated-script-test-output is used to upload results to the flakiness
+ # dashboard. This translation is made because gtest-parallel expects the flag
+ # to be called --dump_json_test_results instead.
+ if options.isolated_script_test_output:
+ gtest_args += [
+ '--dump_json_test_results',
+ options.isolated_script_test_output,
+ ]
-if options.timeout:
- gtest_args += [
- '--timeout',
- str(options.timeout),
- ]
+ if options.output_dir:
+ gtest_args += [
+ '--output_dir',
+ options.output_dir,
+ ]
-command = [
- sys.executable,
- gtest_parallel_path,
-] + gtest_args + ['--'] + test_arguments
+ if options.timeout:
+ gtest_args += [
+ '--timeout',
+ str(options.timeout),
+ ]
-print 'gtest-parallel-wrapper: Executing command %s' % ' '.join(command)
-sys.stdout.flush()
+ command = [
+ sys.executable,
+ gtest_parallel_path,
+ ] + gtest_args + ['--'] + test_arguments
-sys.exit(subprocess.call(command, env=test_env, cwd=os.getcwd()))
+ print 'gtest-parallel-wrapper: Executing command %s' % ' '.join(command)
+ sys.stdout.flush()
+
+ exit_code = subprocess.call(command, env=test_env, cwd=os.getcwd())
+
+ for test_status in 'passed', 'failed', 'interrupted':
+ logs_dir = os.path.join(options.output_dir, test_status)
+ if not os.path.isdir(logs_dir):
+ continue
+ logs = [os.path.join(logs_dir, log) for log in os.listdir(logs_dir)]
+ log_file = os.path.join(options.output_dir, '%s-tests.log' % test_status)
+ cat_files(logs, log_file)
+ os.rmdir(logs_dir)
+
+ return exit_code
+
+
+if __name__ == '__main__':
+ sys.exit(main())