Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 24 deletions

diff --git a/third_party/libwebrtc/infra/specs/test_suites.pyl b/third_party/libwebrtc/infra/specs/test_suites.pyl
index 570314c9bd..e6d98748c7 100644
--- a/third_party/libwebrtc/infra/specs/test_suites.pyl
+++ b/third_party/libwebrtc/infra/specs/test_suites.pyl
@@ -54,6 +54,9 @@
       'webrtc_nonparallel_tests': {},
     },
     'android_tests_tryserver_specific': {
+      'video_codec_perf_tests': {
+        'mixins': ['shards-2', 'quick-perf-tests'],
+      },
       'webrtc_perf_tests': {
         'mixins': ['quick-perf-tests'],
       }
@@ -95,9 +98,6 @@
       'shared_screencast_stream_test': {},
     },
     'desktop_tests_try_server_specific': {
-      'video_capture_tests': {
-        'mixins': ['baremetal-try-pool'],
-      },
       'video_codec_perf_tests': {
         'mixins': ['quick-perf-tests', 'resultdb-gtest-json-format'],
       },
@@ -155,14 +155,13 @@
       'system_wrappers_unittests': {},
       'test_support_unittests': {},
       'tools_unittests': {},
-      'video_capture_tests': {},
       'video_engine_tests': {
         'mixins': ['shards-4'],
       },
     },
     'ios_simulator_tests': {
       'apprtcmobile_tests': {
-        'mixins': ['xcode_parallelization']
+        'mixins': ['xcodebuild_sim_runner']
       },
       'audio_decoder_unittests': {},
       'common_audio_unittests': {},
@@ -181,10 +180,10 @@
         'mixins': ['shards-6'],
       },
       'sdk_framework_unittests': {
-        'mixins': ['xcode_parallelization']
+        'mixins': ['xcodebuild_sim_runner']
       },
       'sdk_unittests': {
-        'mixins': ['xcode_parallelization']
+        'mixins': ['xcodebuild_sim_runner']
       },
       'svc_tests': {
         'mixins': ['shards-4', 'cores-12'],
@@ -192,7 +191,6 @@
       'system_wrappers_unittests': {},
       'test_support_unittests': {},
       'tools_unittests': {},
-      'video_capture_tests': {},
       'video_engine_tests': {
         'mixins': ['shards-4'],
       },
@@ -231,11 +229,6 @@
         ],
       },
     },
-    'video_capture_tests': {
-      'video_capture_tests': {
-        'mixins': ['baremetal-pool'],
-      }
-    },
   },
 
   ##############################################################################
@@ -250,20 +243,11 @@
       'desktop_tests',
       'desktop_tests_try_server_specific',
     ],
-    'desktop_tests_with_video_capture': [
-      'desktop_tests',
-      'video_capture_tests',
-    ],
     'linux_desktop_tests_tryserver': [
       'desktop_tests',
       'desktop_tests_linux_specific',
       'desktop_tests_try_server_specific',
     ],
-    'linux_desktop_tests_with_video_capture': [
-      'desktop_tests',
-      'desktop_tests_linux_specific',
-      'video_capture_tests',
-    ],
     'linux_tests': [
       'desktop_tests',
       'desktop_tests_linux_specific',
@@ -277,9 +261,9 @@
     'ios_simulator_tests_matrix': {
       'ios_simulator_tests': {
         'variants': [
-          'SIM_IPHONE_X_14_5',
           'SIM_IPHONE_X_15_5',
-          'SIM_IPHONE_X_16_2',
+          'SIM_IPHONE_X_16_4',
+          'SIM_IPHONE_14_17_0',
         ],
       },
     },