diff --git a/audio/test/low_bandwidth_audio_test.py b/audio/test/low_bandwidth_audio_test.py index d581b06977..9aaf30f364 100755 --- a/audio/test/low_bandwidth_audio_test.py +++ b/audio/test/low_bandwidth_audio_test.py @@ -31,9 +31,9 @@ NO_TOOLS_ERROR_MESSAGE = ( 'To fix this run:\n' ' python %s %s\n' '\n' - 'Note that these tools are Google-internal due to licensing, so in order ' - 'to use them you will have to get your own license and manually put them ' - 'in the right location.\n' + 'Note that these tools are Google-internal due to licensing, so in order to ' + 'use them you will have to get your own license and manually put them in the ' + 'right location.\n' 'See https://cs.chromium.org/chromium/src/third_party/webrtc/tools_webrtc/' 'download_tools.py?rcl=bbceb76f540159e2dba0701ac03c514f01624130&l=13') @@ -65,9 +65,6 @@ def _ParseArgs(): '--isolated-script-test-perf-output', default=None, help='Path to store perf results in histogram proto format.') - parser.add_argument('--dump_json_test_results', - default=None, - help='Path to store json test results.') parser.add_argument('--extra-test-args', default=[], action='append', @@ -245,14 +242,14 @@ def _ConfigurePythonPath(args): checkout_root = os.path.abspath( os.path.join(script_dir, os.pardir, os.pardir)) - # TODO(https://crbug.com/1029452): Use a copy rule and add these from the - # out dir like for the third_party/protobuf code. + # TODO(https://crbug.com/1029452): Use a copy rule and add these from the out + # dir like for the third_party/protobuf code. sys.path.insert( 0, os.path.join(checkout_root, 'third_party', 'catapult', 'tracing')) - # The low_bandwidth_audio_perf_test gn rule will build the protobuf stub - # for python, so put it in the path for this script before we attempt to - # import it. + # The low_bandwidth_audio_perf_test gn rule will build the protobuf stub for + # python, so put it in the path for this script before we attempt to import + # it. histogram_proto_path = os.path.join(os.path.abspath(args.build_dir), 'pyproto', 'tracing', 'tracing', 'proto') @@ -299,10 +296,7 @@ def main(): ] else: test_command = [ - os.path.join('..', '..', 'tools_webrtc', - 'gtest-parallel-wrapper.py'), - os.path.join(args.build_dir, 'low_bandwidth_audio_test'), - '--dump_json_test_results=%s' % args.dump_json_test_results, + os.path.join(args.build_dir, 'low_bandwidth_audio_test') ] analyzers = [Analyzer('pesq', _RunPesq, pesq_path, 16000)] diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc index 28d8e7730a..d282bf23a1 100644 --- a/test/testsupport/perf_test.cc +++ b/test/testsupport/perf_test.cc @@ -242,7 +242,7 @@ void PrintPlottableResults(const std::vector& desired_graphs) { bool WritePerfResults(const std::string& output_path) { std::string results = GetPerfResults(); CreateDir(DirName(output_path)); - FILE* output = fopen(output_path.c_str(), "ab"); + FILE* output = fopen(output_path.c_str(), "wb"); if (output == NULL) { printf("Failed to write to %s.\n", output_path.c_str()); return false; diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index ec62996961..09550fabcb 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -906,22 +906,14 @@ class MetaBuildWrapper(object): extra_files = [ '../../.vpython', '../../testing/test_env.py', - '../../third_party/gtest-parallel/gtest-parallel', - '../../third_party/gtest-parallel/gtest_parallel.py', - '../../tools_webrtc/gtest-parallel-wrapper.py', ] vpython_exe = 'vpython' - #TODO(crbug.com/webrtc/13475) : use os.path module instead of 'sep'. - sep = '\\' if self.platform == 'win32' else '/' - output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs' - test_results = '${ISOLATED_OUTDIR}' + sep + 'gtest_output.json' must_retry = False if test_type == 'script': cmdline += [vpython_exe, '../../' + - self.ToSrcRelPath(isolate_map[target]['script']), - '--dump_json_test_results=%s' % test_results] + self.ToSrcRelPath(isolate_map[target]['script'])] elif is_android: cmdline += [vpython_exe, '../../build/android/test_wrapper/logdog_wrapper.py', @@ -930,6 +922,11 @@ class MetaBuildWrapper(object): '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones'] else: + if test_type == 'raw': + cmdline += [vpython_exe, + '../../tools_webrtc/flags_compatibility.py'] + extra_files.append('../../tools_webrtc/flags_compatibility.py') + if isolate_map[target].get('use_webcam', False): cmdline += [vpython_exe, '../../tools_webrtc/ensure_webcam_is_running.py'] @@ -946,25 +943,33 @@ class MetaBuildWrapper(object): else: cmdline += [vpython_exe, '../../testing/test_env.py'] - cmdline += [ - '../../tools_webrtc/gtest-parallel-wrapper.py', - '--output_dir=%s' % output_dir, - '--dump_json_test_results=%s' % test_results, - '--gtest_color=no', - ] if test_type != 'raw': - # We tell gtest-parallel to interrupt the test after 900 - # seconds, so it can exit cleanly and report results, - # instead of being interrupted by swarming and not - # reporting anything. + extra_files += [ + '../../third_party/gtest-parallel/gtest-parallel', + '../../third_party/gtest-parallel/gtest_parallel.py', + '../../tools_webrtc/gtest-parallel-wrapper.py', + ] + sep = '\\' if self.platform == 'win32' else '/' + output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs' + test_results = '${ISOLATED_OUTDIR}' + sep + 'gtest_output.json' timeout = isolate_map[target].get('timeout', 900) - cmdline.append('--timeout=%s' % timeout) + cmdline += [ + '../../tools_webrtc/gtest-parallel-wrapper.py', + '--output_dir=%s' % output_dir, + '--dump_json_test_results=%s' % test_results, + '--gtest_color=no', + # We tell gtest-parallel to interrupt the test after 900 + # seconds, so it can exit cleanly and report results, + # instead of being interrupted by swarming and not + # reporting anything. + '--timeout=%s' % timeout, + ] + if test_type == 'non_parallel_console_test_launcher': + # Still use the gtest-parallel-wrapper.py script since we + # need it to run tests on swarming, but don't execute tests + # in parallel. + cmdline.append('--workers=1') must_retry = True - if test_type in ('raw', 'non_parallel_console_test_launcher'): - # Still use the gtest-parallel-wrapper.py script since we - # need it to run tests on swarming, but don't execute tests - # in parallel. - cmdline.append('--workers=1') asan = 'is_asan=true' in vals['gn_args'] lsan = 'is_lsan=true' in vals['gn_args'] diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index 61786ea7dc..a65a55b37b 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -332,13 +332,8 @@ class UnitTest(unittest.TestCase): files = isolate_file_contents['variables']['files'] command = isolate_file_contents['variables']['command'] - self.assertEqual(files, [ - '../../.vpython', '../../testing/test_env.py', - '../../third_party/gtest-parallel/gtest-parallel', - '../../third_party/gtest-parallel/gtest_parallel.py', - '../../tools_webrtc/gtest-parallel-wrapper.py', - 'base_unittests', - ]) + self.assertEqual(files, ['../../.vpython', '../../testing/test_env.py', + 'base_unittests']) self.assertEqual(command, [ 'vpython', '../../build/android/test_wrapper/logdog_wrapper.py', @@ -372,13 +367,8 @@ class UnitTest(unittest.TestCase): files = isolate_file_contents['variables']['files'] command = isolate_file_contents['variables']['command'] - self.assertEqual(files, [ - '../../.vpython', '../../testing/test_env.py', - '../../third_party/gtest-parallel/gtest-parallel', - '../../third_party/gtest-parallel/gtest_parallel.py', - '../../tools_webrtc/gtest-parallel-wrapper.py', - 'base_unittests', - ]) + self.assertEqual(files, ['../../.vpython', '../../testing/test_env.py', + 'base_unittests']) self.assertEqual(command, [ 'vpython', '../../build/android/test_wrapper/logdog_wrapper.py', @@ -467,15 +457,11 @@ class UnitTest(unittest.TestCase): self.assertEqual(files, [ '../../.vpython', '../../testing/test_env.py', - '../../third_party/gtest-parallel/gtest-parallel', - '../../third_party/gtest-parallel/gtest_parallel.py', - '../../tools_webrtc/gtest-parallel-wrapper.py', 'base_unittests', 'base_unittests_script.py', ]) self.assertEqual(command, [ 'vpython', '../../base/base_unittests_script.py', - '--dump_json_test_results=${ISOLATED_OUTDIR}/gtest_output.json', ]) def test_gen_raw(self): @@ -505,19 +491,14 @@ class UnitTest(unittest.TestCase): self.assertEqual(files, [ '../../.vpython', '../../testing/test_env.py', - '../../third_party/gtest-parallel/gtest-parallel', - '../../third_party/gtest-parallel/gtest_parallel.py', - '../../tools_webrtc/gtest-parallel-wrapper.py', + '../../tools_webrtc/flags_compatibility.py', 'base_unittests', ]) self.assertEqual(command, [ + 'vpython', + '../../tools_webrtc/flags_compatibility.py', 'vpython', '../../testing/test_env.py', - '../../tools_webrtc/gtest-parallel-wrapper.py', - '--output_dir=${ISOLATED_OUTDIR}/test_logs', - '--dump_json_test_results=${ISOLATED_OUTDIR}/gtest_output.json', - '--gtest_color=no', - '--workers=1', './base_unittests', '--asan=0', '--lsan=0',