mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1828517 - Vendor libwebrtc from 91b62e0e8f 

Upstream commit: https://webrtc.googlesource.com/src/+/91b62e0e8fd1788c1964403ed34160c47190aad0
    Remove global gtest_parallel timeout.

    It is causing flakiness on win asan bots rtc_unittests.
    The gtest_parallel timeout is set to 15 minutes but there is already a swarming timeout set to one hour.
    https://luci-analysis.appspot.com/p/webrtc/clusters/testname-v3/218550890147469e975d34b17d4c6545#recent-failures
    https://luci-analysis.appspot.com/p/webrtc/clusters/testname-v3/968d49e7d00955cc65fa84dfa54b7c2a#recent-failures

    There is a comment stating that it's useful because it gets information when the swarming timeout is reached but:
    * swarming timeouts are more likely to occur on device phone before impacting desktop bots.
    * if a swarming timeout occurs, isolating which tests take too long shouldn't be too hard.

    Change-Id: I2089918e8cd266510d58bac8c91d92b6c8e81728
    Bug: webrtc:14790
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288384
    Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
    Commit-Queue: Jeremy Leconte <jleconte@google.com>
    Cr-Commit-Position: refs/heads/main@{#38918}
This commit is contained in:
Michael Froman 2023-04-20 10:44:01 -05:00
Родитель 7f4ac3c43f
Коммит 18229329bf
4 изменённых файлов: 5 добавлений и 60 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
third_party/libwebrtc/README.moz-ff-commit поставляемый
Просмотреть файл

@ -20370,3 +20370,6 @@ de57c57e1e
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
82da9324bc
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
91b62e0e8f

2
third_party/libwebrtc/README.mozilla поставляемый
Просмотреть файл

@ -13602,3 +13602,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-20T15:41:01.674238.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-20T15:41:56.969558.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-20T15:43:49.896628.

6
third_party/libwebrtc/tools_webrtc/mb/mb.py поставляемый
Просмотреть файл

@ -119,16 +119,10 @@ class WebRTCMetaBuildWrapper(mb.MetaBuildWrapper):
'../../tools_webrtc/gtest-parallel-wrapper.py',
]
output_dir = '${ISOLATED_OUTDIR}/test_logs'
timeout = isolate_map[target].get('timeout', 900)
cmdline += [
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=%s' % output_dir,
'--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

54
third_party/libwebrtc/tools_webrtc/mb/mb_unittest.py поставляемый
Просмотреть файл

@ -381,55 +381,6 @@ class UnitTest(unittest.TestCase):
'--store-tombstones',
])
def test_gen_timeout(self):
test_files = {
'/tmp/swarming_targets':
'foo_unittests\n',
'/fake_src/testing/buildbot/gn_isolate_map.pyl':
("{'foo_unittests': {"
" 'label': '//foo:foo_unittests',"
" 'type': 'non_parallel_console_test_launcher',"
" 'timeout': 500,"
"}}\n"),
'/fake_src/out/Default/foo_unittests.runtime_deps': ("foo_unittests\n"),
}
mbw = self.check([
'gen', '-c', 'debug_goma', '//out/Default', '--swarming-targets-file',
'/tmp/swarming_targets', '--isolate-map-file',
'/fake_src/testing/buildbot/gn_isolate_map.pyl'
],
files=test_files,
ret=0)
isolate_file = mbw.files['/fake_src/out/Default/foo_unittests.isolate']
isolate_file_contents = ast.literal_eval(isolate_file)
files = isolate_file_contents['variables']['files']
command = isolate_file_contents['variables']['command']
self.assertEqual(files, [
'../../.vpython3',
'../../testing/test_env.py',
'../../third_party/gtest-parallel/gtest-parallel',
'../../third_party/gtest-parallel/gtest_parallel.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'foo_unittests',
])
self.assertEqual(command, [
'vpython3',
'../../testing/test_env.py',
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=500',
'--workers=1',
'--retry_failed=3',
'./foo_unittests',
'--asan=0',
'--lsan=0',
'--msan=0',
'--tsan=0',
])
def test_gen_script(self):
test_files = {
'/tmp/swarming_targets':
@ -538,7 +489,6 @@ class UnitTest(unittest.TestCase):
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'--workers=1',
'--retry_failed=3',
'./foo_unittests',
@ -590,7 +540,6 @@ class UnitTest(unittest.TestCase):
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'--retry_failed=3',
'./foo_unittests',
'--asan=0',
@ -642,7 +591,6 @@ class UnitTest(unittest.TestCase):
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'--retry_failed=3',
r'.\unittests.exe',
'--asan=0',
@ -689,7 +637,6 @@ class UnitTest(unittest.TestCase):
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'--retry_failed=3',
'./foo_unittests',
'--asan=0',
@ -743,7 +690,6 @@ class UnitTest(unittest.TestCase):
'../../tools_webrtc/gtest-parallel-wrapper.py',
'--output_dir=${ISOLATED_OUTDIR}/test_logs',
'--gtest_color=no',
'--timeout=900',
'--retry_failed=3',
'./foo_unittests',
'--asan=0',