diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 36b67f74c3..d23df1a8c8 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -3324,32 +3324,6 @@ }, "test_id_prefix": "ninja://pc:peerconnection_unittests/" }, - { - "args": [ - ".", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "pipewire_shared_screencast_stream_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "pipewire_shared_screencast_stream_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "os": "Ubuntu-18.04" - } - ] - }, - "test_id_prefix": "ninja://modules/desktop_capture:pipewire_shared_screencast_stream_test/" - }, { "isolate_name": "rtc_media_unittests", "merge": { @@ -4649,32 +4623,6 @@ }, "test_id_prefix": "ninja://pc:peerconnection_unittests/" }, - { - "args": [ - ".", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "pipewire_shared_screencast_stream_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "pipewire_shared_screencast_stream_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "os": "Ubuntu-18.04" - } - ] - }, - "test_id_prefix": "ninja://modules/desktop_capture:pipewire_shared_screencast_stream_test/" - }, { "isolate_name": "rtc_media_unittests", "merge": { @@ -5108,32 +5056,6 @@ }, "test_id_prefix": "ninja://pc:peerconnection_unittests/" }, - { - "args": [ - ".", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "pipewire_shared_screencast_stream_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "pipewire_shared_screencast_stream_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "os": "Ubuntu-18.04" - } - ] - }, - "test_id_prefix": "ninja://modules/desktop_capture:pipewire_shared_screencast_stream_test/" - }, { "isolate_name": "rtc_media_unittests", "merge": { diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index e7130369bc..4cd67602c8 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -5944,32 +5944,6 @@ }, "test_id_prefix": "ninja://pc:peerconnection_unittests/" }, - { - "args": [ - ".", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "pipewire_shared_screencast_stream_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "pipewire_shared_screencast_stream_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "os": "Ubuntu-18.04" - } - ] - }, - "test_id_prefix": "ninja://modules/desktop_capture:pipewire_shared_screencast_stream_test/" - }, { "isolate_name": "rtc_media_unittests", "merge": { @@ -8728,32 +8702,6 @@ }, "test_id_prefix": "ninja://pc:peerconnection_unittests/" }, - { - "args": [ - ".", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "pipewire_shared_screencast_stream_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "pipewire_shared_screencast_stream_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "os": "Ubuntu-18.04" - } - ] - }, - "test_id_prefix": "ninja://modules/desktop_capture:pipewire_shared_screencast_stream_test/" - }, { "isolate_name": "rtc_media_unittests", "merge": { @@ -9187,32 +9135,6 @@ }, "test_id_prefix": "ninja://pc:peerconnection_unittests/" }, - { - "args": [ - ".", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "pipewire_shared_screencast_stream_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "pipewire_shared_screencast_stream_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "os": "Ubuntu-18.04" - } - ] - }, - "test_id_prefix": "ninja://modules/desktop_capture:pipewire_shared_screencast_stream_test/" - }, { "isolate_name": "rtc_media_unittests", "merge": { diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index e2c72ef50e..99fc2b7b96 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -83,41 +83,51 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. + 'isolated_scripts': 'desktop_tests', }, }, 'Linux MSan': { 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { + # TODO(crbug.com/webrtc/14568): Using 'linux_tests' + # fails on "MemorySanitizer: use-of-uninitialized-value in + # libpipewire-0.3.so." + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. 'isolated_scripts': 'desktop_tests', - # TODO(crbug.com/webrtc/14568): use 'linux_tests' - # Fails on "MemorySanitizer: use-of-uninitialized-value in - # libpipewire-0.3.so" }, }, 'Linux Tsan v2': { 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { + # TODO(crbug.com/webrtc/14568): Using 'linux_tests' + # fails on "ThreadSanitizer: data race on vptr (ctor/dtor vs + # virtual call) in shared_screencast_stream_test." + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. 'isolated_scripts': 'desktop_tests', - # TODO(crbug.com/webrtc/14568): use 'linux_tests' - # Fails on "ThreadSanitizer: data race on vptr (ctor/dtor vs - # virtual call) in shared_screencast_stream_test" }, }, 'Linux UBSan': { 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. + 'isolated_scripts': 'desktop_tests', }, }, 'Linux UBSan vptr': { 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. + 'isolated_scripts': 'desktop_tests', }, }, 'Linux32 Debug': { @@ -481,7 +491,9 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. + 'isolated_scripts': 'desktop_tests', }, }, 'linux_compile_arm64_dbg': {}, @@ -516,10 +528,12 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { + # TODO(crbug.com/webrtc/14568): Using 'linux_tests' + # fails on "MemorySanitizer: use-of-uninitialized-value in + # libpipewire-0.3.so." + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. 'isolated_scripts': 'desktop_tests', - # TODO(crbug.com/webrtc/14568): use 'linux_tests' - # Fails on "MemorySanitizer: use-of-uninitialized-value in - # libpipewire-0.3.so" }, }, 'linux_rel': { @@ -533,24 +547,30 @@ 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { + # TODO(crbug.com/webrtc/14568): Using 'linux_tests' + # fails on "ThreadSanitizer: data race on vptr (ctor/dtor vs + # virtual call) in shared_screencast_stream_test." + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. 'isolated_scripts': 'desktop_tests', - # TODO(crbug.com/webrtc/14568): use 'linux_tests' - # Fails on "ThreadSanitizer: data race on vptr (ctor/dtor vs - # virtual call) in shared_screencast_stream_test" }, }, 'linux_ubsan': { 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. + 'isolated_scripts': 'desktop_tests', }, }, 'linux_ubsan_vptr': { 'os_type': 'linux', 'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'], 'test_suites': { - 'isolated_scripts': 'linux_tests', + # TODO(crbug.com/webrtc/14644): Replace desktop_tests by linux_tests + # when the failing pipewire tests are ignored on sanitizers. + 'isolated_scripts': 'desktop_tests', }, }, 'linux_x86_dbg': {