Add desktop_capture_unittests and desktop_capture_modules_tests rtc_test_suite. Change-Id: I925ac7e799465e378d0ae6580f6e85a72592bb53 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/490380 Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48216}
diff --git a/BUILD.gn b/BUILD.gn index ad90f3b..442d5f2 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -147,7 +147,11 @@ "//video/adaptation:video_adaptation_tests", ] if (rtc_desktop_capture_supported) { - deps += [ "//modules/desktop_capture:xvfb_capture_tests" ] + deps += [ + "//modules/desktop_capture:desktop_capture_modules_tests", + "//modules/desktop_capture:desktop_capture_unittests", + "//modules/desktop_capture:xvfb_capture_tests", + ] if (is_mac) { deps += [ "//modules/desktop_capture:desktop_capture_mac_unittests" ] }
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 1325cf9..f974dcf 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json
@@ -1902,6 +1902,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -2416,6 +2452,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -2930,6 +3002,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -3444,6 +3552,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -3958,6 +4102,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -4472,6 +4652,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -4969,6 +5185,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -5467,6 +5719,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -5982,6 +6270,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -6523,6 +6847,44 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -7065,6 +7427,44 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -7600,6 +8000,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -8114,6 +8550,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-26" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-26" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -8636,6 +9108,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -9150,6 +9658,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -9664,6 +10208,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -10178,6 +10758,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": {
diff --git a/infra/specs/gn_isolate_map.pyl b/infra/specs/gn_isolate_map.pyl index 61ebdf9..c9a04aa 100644 --- a/infra/specs/gn_isolate_map.pyl +++ b/infra/specs/gn_isolate_map.pyl
@@ -76,6 +76,14 @@ "label": "//modules/desktop_capture:desktop_capture_mac_unittests", "type": "console_test_launcher", }, + "desktop_capture_modules_tests": { + "label": "//modules/desktop_capture:desktop_capture_modules_tests", + "type": "console_test_launcher", + }, + "desktop_capture_unittests": { + "label": "//modules/desktop_capture:desktop_capture_unittests", + "type": "console_test_launcher", + }, "desktop_capture_win_unittests": { "label": "//modules/desktop_capture:desktop_capture_win_unittests", "type": "console_test_launcher",
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index a28e7f1..e6f47c1 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl
@@ -80,6 +80,8 @@ 'common_audio_unittests': {}, 'common_video_unittests': {}, 'dcsctp_unittests': {}, + 'desktop_capture_modules_tests': {}, + 'desktop_capture_unittests': {}, 'modules_tests': { 'mixins': ['shards-2'], },
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 9606dd3..e47d967 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json
@@ -4456,6 +4456,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -4983,6 +5019,44 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "isolate_profile_data": true, + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "isolate_profile_data": true, + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -5568,6 +5642,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -6106,6 +6216,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -6620,6 +6766,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -7182,6 +7364,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -7696,6 +7914,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -8210,6 +8464,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -8724,6 +9014,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -9220,6 +9546,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -9741,6 +10103,44 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -10285,6 +10685,44 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -10820,6 +11258,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-26" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-26" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -11334,6 +11808,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -11896,6 +12406,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-26" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-26" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules:modules_tests", "name": "modules_tests", "resultdb": { @@ -12392,6 +12938,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -12906,6 +13488,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -13468,6 +14086,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -13986,6 +14640,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -14500,6 +15190,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -15014,6 +15740,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": { @@ -15528,6 +16290,42 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//modules/desktop_capture:desktop_capture_modules_tests", + "name": "desktop_capture_modules_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_modules_tests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_modules_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//modules/desktop_capture:desktop_capture_unittests", + "name": "desktop_capture_unittests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "desktop_capture_unittests", + "test_id_prefix": "ninja://modules/desktop_capture:desktop_capture_unittests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//modules/desktop_capture:desktop_capture_win_unittests", "name": "desktop_capture_win_unittests", "resultdb": {
diff --git a/modules/BUILD.gn b/modules/BUILD.gn index 95e1af6..b8e4a7e 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn
@@ -54,10 +54,6 @@ "//testing/gtest", ] - if (rtc_desktop_capture_supported) { - deps += [ "desktop_capture:desktop_capture_modules_tests" ] - } - data_deps = [ "../resources:modules_tests_data" ] if (is_ios) { @@ -92,9 +88,6 @@ if (rtc_enable_protobuf) { deps += [ "audio_processing/aec3/neural_residual_echo_estimator:neural_residual_echo_estimator_unittest" ] } - if (rtc_desktop_capture_supported) { - deps += [ "desktop_capture:desktop_capture_unittests" ] - } data_deps = [ "../resources:modules_unittests_data" ]
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index 4b3e091..42a8f52 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn
@@ -49,46 +49,93 @@ } if (rtc_include_tests) { - rtc_library("desktop_capture_modules_tests") { - testonly = true - - defines = [] - sources = [] + rtc_cc_test("screen_capturer_integration_test") { + sources = [ "screen_capturer_integration_test.cc" ] deps = [ ":desktop_capture", + ":desktop_capture_mock", + ":primitives", + ":screen_drawer", "../../api:function_view", "../../api:scoped_refptr", + "../../rtc_base:base64", "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base:platform_thread", "../../rtc_base:random", + "../../rtc_base:threading", "../../rtc_base:timeutils", + "../../test:test_support", ] - if (rtc_desktop_capture_supported) { - deps += [ - ":desktop_capture_mock", - ":primitives", - ":screen_drawer", - "../../rtc_base:base64", - "../../rtc_base:threading", - "../../test:test_support", - ] - sources += [ - "screen_capturer_integration_test.cc", - "screen_drawer_unittest.cc", - "window_finder_unittest.cc", - ] - - if ((is_linux || is_chromeos) && rtc_use_pipewire) { - configs += [ "../portal:gio" ] - } - - public_configs = [ ":x11_config" ] - - if (is_win) { - deps += [ "../../rtc_base/win:windows_version" ] - } + if (is_win) { + deps += [ "../../rtc_base/win:windows_version" ] } + if ((is_linux || is_chromeos) && rtc_use_pipewire) { + configs += [ "../portal:gio" ] + } + public_configs = [ ":x11_config" ] + } + + rtc_cc_test("screen_drawer_unittest") { + sources = [ "screen_drawer_unittest.cc" ] + deps = [ + ":desktop_capture", + ":desktop_capture_mock", + ":primitives", + ":screen_drawer", + "../../api:function_view", + "../../api:scoped_refptr", + "../../rtc_base:base64", + "../../rtc_base:checks", + "../../rtc_base:logging", + "../../rtc_base:platform_thread", + "../../rtc_base:random", + "../../rtc_base:threading", + "../../rtc_base:timeutils", + "../../test:test_support", + ] + if (is_win) { + deps += [ "../../rtc_base/win:windows_version" ] + } + if ((is_linux || is_chromeos) && rtc_use_pipewire) { + configs += [ "../portal:gio" ] + } + public_configs = [ ":x11_config" ] + } + + rtc_cc_test("window_finder_unittest") { + sources = [ "window_finder_unittest.cc" ] + deps = [ + ":desktop_capture", + ":desktop_capture_mock", + ":primitives", + ":screen_drawer", + "../../api:function_view", + "../../api:scoped_refptr", + "../../rtc_base:base64", + "../../rtc_base:checks", + "../../rtc_base:logging", + "../../rtc_base:platform_thread", + "../../rtc_base:random", + "../../rtc_base:threading", + "../../rtc_base:timeutils", + "../../test:test_support", + ] + if (is_win) { + deps += [ "../../rtc_base/win:windows_version" ] + } + if ((is_linux || is_chromeos) && rtc_use_pipewire) { + configs += [ "../portal:gio" ] + } + public_configs = [ ":x11_config" ] + } + + rtc_test_suite("desktop_capture_modules_tests") { + tests = [ + ":screen_capturer_integration_test", + ":screen_drawer_unittest", + ":window_finder_unittest", + ] } if ((is_linux || is_chromeos) && rtc_use_pipewire) { @@ -144,8 +191,7 @@ ] } - rtc_library("desktop_frame_texture_unittest") { - testonly = true + rtc_cc_test("desktop_frame_texture_unittest") { sources = [ "desktop_frame_texture_unittest.cc" ] deps = [ ":primitives", @@ -153,8 +199,7 @@ ] } - rtc_library("desktop_frame_unittest") { - testonly = true + rtc_cc_test("desktop_frame_unittest") { sources = [ "desktop_frame_unittest.cc" ] deps = [ ":primitives", @@ -162,8 +207,7 @@ ] } - rtc_library("desktop_geometry_unittest") { - testonly = true + rtc_cc_test("desktop_geometry_unittest") { sources = [ "desktop_geometry_unittest.cc" ] deps = [ ":primitives", @@ -171,8 +215,7 @@ ] } - rtc_library("desktop_region_unittest") { - testonly = true + rtc_cc_test("desktop_region_unittest") { sources = [ "desktop_region_unittest.cc" ] deps = [ ":primitives", @@ -180,8 +223,7 @@ ] } - rtc_library("desktop_capturer_differ_wrapper_unittest") { - testonly = true + rtc_cc_test("desktop_capturer_differ_wrapper_unittest") { sources = [ "desktop_capturer_differ_wrapper_unittest.cc" ] deps = [ ":desktop_capture", @@ -200,8 +242,7 @@ } } - rtc_library("differ_block_unittest") { - testonly = true + rtc_cc_test("differ_block_unittest") { sources = [ "differ_block_unittest.cc" ] deps = [ ":desktop_capture", @@ -209,8 +250,7 @@ ] } - rtc_library("blank_detector_desktop_capturer_wrapper_unittest") { - testonly = true + rtc_cc_test("blank_detector_desktop_capturer_wrapper_unittest") { sources = [ "blank_detector_desktop_capturer_wrapper_unittest.cc" ] deps = [ ":desktop_capture", @@ -222,8 +262,7 @@ } } - rtc_library("desktop_and_cursor_composer_unittest") { - testonly = true + rtc_cc_test("desktop_and_cursor_composer_unittest") { sources = [ "desktop_and_cursor_composer_unittest.cc" ] deps = [ ":desktop_capture", @@ -235,8 +274,7 @@ } } - rtc_library("fallback_desktop_capturer_wrapper_unittest") { - testonly = true + rtc_cc_test("fallback_desktop_capturer_wrapper_unittest") { sources = [ "fallback_desktop_capturer_wrapper_unittest.cc" ] deps = [ ":desktop_capture", @@ -248,8 +286,7 @@ } } - rtc_library("cropped_desktop_frame_unittest") { - testonly = true + rtc_cc_test("cropped_desktop_frame_unittest") { sources = [ "cropped_desktop_frame_unittest.cc" ] deps = [ ":desktop_capture", @@ -258,8 +295,7 @@ ] } - rtc_library("desktop_frame_rotation_unittest") { - testonly = true + rtc_cc_test("desktop_frame_rotation_unittest") { sources = [ "desktop_frame_rotation_unittest.cc" ] deps = [ ":desktop_capture", @@ -269,8 +305,7 @@ ] } - rtc_library("rgba_color_unittest") { - testonly = true + rtc_cc_test("rgba_color_unittest") { sources = [ "rgba_color_unittest.cc" ] deps = [ ":desktop_capture", @@ -278,8 +313,7 @@ ] } - rtc_library("test_utils_unittest") { - testonly = true + rtc_cc_test("test_utils_unittest") { sources = [ "test_utils_unittest.cc" ] deps = [ ":desktop_capture", @@ -370,8 +404,7 @@ } } - rtc_library("screen_capturer_helper_unittest") { - testonly = true + rtc_cc_test("screen_capturer_helper_unittest") { sources = [ "screen_capturer_helper_unittest.cc" ] deps = [ ":desktop_capture", @@ -466,10 +499,8 @@ ] } - rtc_library("desktop_capture_unittests") { - testonly = true - - deps = [ + rtc_test_suite("desktop_capture_unittests") { + tests = [ ":blank_detector_desktop_capturer_wrapper_unittest", ":cropped_desktop_frame_unittest", ":desktop_and_cursor_composer_unittest",