mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace dash by underscore in the command line argument before absl flag parsing.

Browse source 
The expected behavior is to have something similar than python:
https://docs.python.org/dev/library/argparse.html#dest:
"Any internal - characters will be converted to _ characters to make sure the string is a valid attribute name".

This allows to catch chromium arguments like 'isolated-script-test-output' that previously needed some preprocessing done for example in flags_compatibility.py.

This CL also fixes a fuchsia specific issue where the test runner needs a 'isolated-script-test-output' argument but then pass the argument to WebRTC that expects a 'isolated_script_test_output' argument. Thus calling flags_compatibility before the test_runner fails and there is not much room to change the argument in between the test runner and the test.

Change-Id: I48a591743fa50484a0ec584a3f9e97d9e0fd25ef
Bug: webrtc:14694
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284541
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38707}
This commit is contained in:
Jeremy Leconte 2022-11-22 11:06:47 +01:00 committed by WebRTC LUCI CQ
parent a3a3b6d798
commit c6ae33fb07
13 changed files with 93 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
infra/specs/client.webrtc.json
View file

@ -2097,10 +2097,6 @@
"Fuchsia Release": { "Fuchsia Release": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "audio_decoder_unittests", "isolate_name": "audio_decoder_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2108,7 +2104,8 @@
}, },
"name": "audio_decoder_unittests", "name": "audio_decoder_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2122,10 +2119,6 @@
"test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/" "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "common_audio_unittests", "isolate_name": "common_audio_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2133,7 +2126,8 @@
}, },
"name": "common_audio_unittests", "name": "common_audio_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2147,10 +2141,6 @@
"test_id_prefix": "ninja://common_audio:common_audio_unittests/" "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "common_video_unittests", "isolate_name": "common_video_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2158,7 +2148,8 @@
}, },
"name": "common_video_unittests", "name": "common_video_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2172,10 +2163,6 @@
"test_id_prefix": "ninja://common_video:common_video_unittests/" "test_id_prefix": "ninja://common_video:common_video_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "dcsctp_unittests", "isolate_name": "dcsctp_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2183,7 +2170,8 @@
}, },
"name": "dcsctp_unittests", "name": "dcsctp_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2197,10 +2185,6 @@
"test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "low_bandwidth_audio_test", "isolate_name": "low_bandwidth_audio_test",
"merge": { "merge": {
"args": [], "args": [],
@ -2208,7 +2192,8 @@
}, },
"name": "low_bandwidth_audio_test", "name": "low_bandwidth_audio_test",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -9003,7 +8988,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9051,7 +9035,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9098,7 +9081,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9145,7 +9127,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9192,7 +9173,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9239,7 +9219,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9287,7 +9266,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9335,7 +9313,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9382,7 +9359,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9429,7 +9405,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9476,7 +9451,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9524,7 +9498,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9572,7 +9545,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9620,7 +9592,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9669,7 +9640,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9716,7 +9686,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9763,7 +9732,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9810,7 +9778,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9857,7 +9824,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9905,7 +9871,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -9952,7 +9917,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10003,7 +9967,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10051,7 +10014,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10098,7 +10060,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10145,7 +10106,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10192,7 +10152,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10239,7 +10198,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10287,7 +10245,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10335,7 +10292,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10382,7 +10338,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10429,7 +10384,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10476,7 +10430,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10524,7 +10477,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10572,7 +10524,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10620,7 +10571,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10669,7 +10619,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10716,7 +10665,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10763,7 +10711,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10810,7 +10757,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10857,7 +10803,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10905,7 +10850,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -10952,7 +10896,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11003,7 +10946,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11051,7 +10993,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11098,7 +11039,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11145,7 +11085,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11192,7 +11131,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11239,7 +11177,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11287,7 +11224,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11335,7 +11271,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11382,7 +11317,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11429,7 +11363,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11476,7 +11409,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11524,7 +11456,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11572,7 +11503,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11620,7 +11550,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11669,7 +11598,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11716,7 +11644,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11763,7 +11690,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11810,7 +11736,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11857,7 +11782,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11905,7 +11829,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -11952,7 +11875,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",

22
infra/specs/internal.client.webrtc.json
View file

@ -6,7 +6,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -50,7 +49,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -95,7 +93,6 @@
"args": [ "args": [
"--readline-timeout=1200", "--readline-timeout=1200",
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -142,7 +139,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -187,7 +183,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -231,7 +226,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -275,7 +269,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -319,7 +312,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -363,7 +355,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -407,7 +398,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -451,7 +441,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -555,7 +544,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -599,7 +587,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -644,7 +631,6 @@
"args": [ "args": [
"--readline-timeout=1200", "--readline-timeout=1200",
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -691,7 +677,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -736,7 +721,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -780,7 +764,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -824,7 +807,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -868,7 +850,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -912,7 +893,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -956,7 +936,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -1000,7 +979,6 @@
{ {
"args": [ "args": [
"--xctest", "--xctest",
"--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",

25
infra/specs/mixins.pyl
View file

@ -59,11 +59,6 @@
} }
} }
}, },
'fuchsia': {
'$mixin_append': {
'args': ['--', '--undefok=use-vulkan']
}
},
'hammerhead': { 'hammerhead': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
@ -98,10 +93,7 @@
}, },
'ios-simulator-12.4': { 'ios-simulator-12.4': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': ['--platform', 'iPhone X', '--version', '12.4'],
'--platform', 'iPhone X', '--version', '12.4',
'--undefok=write-compiled-tests-json-to-writable-path'
],
'swarming': { 'swarming': {
'named_caches': [{ 'named_caches': [{
'name': 'runtime_ios_12_4', 'name': 'runtime_ios_12_4',
@ -112,10 +104,7 @@
}, },
'ios-simulator-13.6': { 'ios-simulator-13.6': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': ['--platform', 'iPhone X', '--version', '13.6'],
'--platform', 'iPhone X', '--version', '13.6',
'--undefok=write-compiled-tests-json-to-writable-path'
],
'swarming': { 'swarming': {
'named_caches': [{ 'named_caches': [{
'name': 'runtime_ios_13_6', 'name': 'runtime_ios_13_6',
@ -126,10 +115,7 @@
}, },
'ios-simulator-14.5': { 'ios-simulator-14.5': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': ['--platform', 'iPhone X', '--version', '14.5'],
'--platform', 'iPhone X', '--version', '14.5',
'--undefok=write-compiled-tests-json-to-writable-path'
],
'swarming': { 'swarming': {
'named_caches': [{ 'named_caches': [{
'name': 'runtime_ios_14_5', 'name': 'runtime_ios_14_5',
@ -309,10 +295,7 @@
}, },
'webrtc-xctest': { 'webrtc-xctest': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': ['--xctest']
'--xctest',
'--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path'
]
} }
}, },
'win10': { 'win10': {

9
infra/specs/mixins_webrtc.pyl
View file

@ -68,7 +68,6 @@
'iPhone X', 'iPhone X',
'--version', '--version',
'12.4', '12.4',
'--undefok=write-compiled-tests-json-to-writable-path',
], ],
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
@ -87,7 +86,6 @@
'iPhone X', 'iPhone X',
'--version', '--version',
'13.6', '13.6',
'--undefok=write-compiled-tests-json-to-writable-path',
], ],
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
@ -106,7 +104,6 @@
'iPhone X', 'iPhone X',
'--version', '--version',
'14.5', '14.5',
'--undefok=write-compiled-tests-json-to-writable-path',
], ],
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
@ -188,11 +185,6 @@
} }
} }
}, },
'fuchsia': {
'$mixin_append': {
'args': ['--', '--undefok=use-vulkan']
}
},
'resultdb-gtest-json-format': { 'resultdb-gtest-json-format': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
@ -248,7 +240,6 @@
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
'--xctest', '--xctest',
'--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path',
], ],
}, },
}, },

98
infra/specs/tryserver.webrtc.json
View file

@ -2208,10 +2208,6 @@
"fuchsia_rel": { "fuchsia_rel": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "audio_decoder_unittests", "isolate_name": "audio_decoder_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2219,7 +2215,8 @@
}, },
"name": "audio_decoder_unittests", "name": "audio_decoder_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2233,10 +2230,6 @@
"test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/" "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "common_audio_unittests", "isolate_name": "common_audio_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2244,7 +2237,8 @@
}, },
"name": "common_audio_unittests", "name": "common_audio_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2258,10 +2252,6 @@
"test_id_prefix": "ninja://common_audio:common_audio_unittests/" "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "common_video_unittests", "isolate_name": "common_video_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2269,7 +2259,8 @@
}, },
"name": "common_video_unittests", "name": "common_video_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2283,10 +2274,6 @@
"test_id_prefix": "ninja://common_video:common_video_unittests/" "test_id_prefix": "ninja://common_video:common_video_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "dcsctp_unittests", "isolate_name": "dcsctp_unittests",
"merge": { "merge": {
"args": [], "args": [],
@ -2294,7 +2281,8 @@
}, },
"name": "dcsctp_unittests", "name": "dcsctp_unittests",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2308,10 +2296,6 @@
"test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/" "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
}, },
{ {
"args": [
"--",
"--undefok=use-vulkan"
],
"isolate_name": "low_bandwidth_audio_test", "isolate_name": "low_bandwidth_audio_test",
"merge": { "merge": {
"args": [], "args": [],
@ -2319,7 +2303,8 @@
}, },
"name": "low_bandwidth_audio_test", "name": "low_bandwidth_audio_test",
"resultdb": { "resultdb": {
"result_format": "json" "enable": true,
"has_native_resultdb_integration": true
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
@ -2344,7 +2329,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2392,7 +2376,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2439,7 +2422,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2486,7 +2468,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2533,7 +2514,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2580,7 +2560,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2628,7 +2607,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2676,7 +2654,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2723,7 +2700,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2770,7 +2746,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2817,7 +2792,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2865,7 +2839,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2913,7 +2886,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -2961,7 +2933,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3010,7 +2981,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3057,7 +3027,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3104,7 +3073,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3151,7 +3119,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3198,7 +3165,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3246,7 +3212,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3293,7 +3258,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"12.4", "12.4",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3344,7 +3308,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3392,7 +3355,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3439,7 +3401,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3486,7 +3447,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3533,7 +3493,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3580,7 +3539,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3628,7 +3586,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3676,7 +3633,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3723,7 +3679,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3770,7 +3725,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3817,7 +3771,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3865,7 +3818,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3913,7 +3865,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -3961,7 +3912,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4010,7 +3960,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4057,7 +4006,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4104,7 +4052,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4151,7 +4098,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4198,7 +4144,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4246,7 +4191,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4293,7 +4237,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"13.6", "13.6",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4344,7 +4287,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4392,7 +4334,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4439,7 +4380,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4486,7 +4426,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4533,7 +4472,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4580,7 +4518,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4628,7 +4565,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4676,7 +4612,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4723,7 +4658,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4770,7 +4704,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4817,7 +4750,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4865,7 +4797,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4913,7 +4844,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -4961,7 +4891,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5010,7 +4939,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5057,7 +4985,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5104,7 +5031,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5151,7 +5077,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5198,7 +5123,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5246,7 +5170,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",
@ -5293,7 +5216,6 @@
"iPhone X", "iPhone X",
"--version", "--version",
"14.5", "14.5",
"--undefok=write-compiled-tests-json-to-writable-path",
"--xcode-build-version", "--xcode-build-version",
"13c100", "13c100",
"--out-dir", "--out-dir",

4
infra/specs/waterfalls.pyl
View file

@ -68,7 +68,7 @@
'Fuchsia Release': { 'Fuchsia Release': {
'os_type': 'linux', 'os_type': 'linux',
'mixins': 'mixins':
['linux-bionic', 'x86-64', 'resultdb-json-format', 'fuchsia'], ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
'test_suites': { 'test_suites': {
'isolated_scripts': 'fuchsia_compatible_tests', 'isolated_scripts': 'fuchsia_compatible_tests',
}, },
@ -467,7 +467,7 @@
'fuchsia_rel': { 'fuchsia_rel': {
'os_type': 'linux', 'os_type': 'linux',
'mixins': 'mixins':
['linux-bionic', 'x86-64', 'resultdb-json-format', 'fuchsia'], ['linux-bionic', 'x86-64', 'has_native_resultdb_integration'],
'test_suites': { 'test_suites': {
'isolated_scripts': 'fuchsia_compatible_tests', 'isolated_scripts': 'fuchsia_compatible_tests',
}, },

38
test/test_main.cc
View file

@ -9,6 +9,9 @@
*/ */
#include <memory> #include <memory>
#include <regex>
#include <string>
#include <vector>
#include "absl/debugging/failure_signal_handler.h" #include "absl/debugging/failure_signal_handler.h"
#include "absl/debugging/symbolize.h" #include "absl/debugging/symbolize.h"
@ -16,11 +19,44 @@
#include "test/gmock.h" #include "test/gmock.h"
#include "test/test_main_lib.h" #include "test/test_main_lib.h"
namespace {
std::vector<std::string> ReplaceDashesWithUnderscores(int argc, char* argv[]) {
std::vector<std::string> args(argv, argv + argc);
for (std::string& arg : args) {
// Only replace arguments that starts with a dash.
if (!arg.empty() && arg[0] == '-') {
// Don't replace the 2 first characters.
auto begin = arg.begin() + 2;
// Replace dashes on the left of '=' or on all the arg if no '=' is found.
auto end = std::find(arg.begin(), arg.end(), '=');
std::replace(begin, end, '-', '_');
}
}
return args;
}
std::vector<char*> VectorOfStringsToVectorOfPointers(
std::vector<std::string>& input) {
std::vector<char*> output(input.size());
for (size_t i = 0; i < input.size(); ++i) {
output[i] = &(input[i][0]);
}
return output;
}
} // namespace
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
// Initialize the symbolizer to get a human-readable stack trace // Initialize the symbolizer to get a human-readable stack trace
absl::InitializeSymbolizer(argv[0]); absl::InitializeSymbolizer(argv[0]);
testing::InitGoogleMock(&argc, argv); testing::InitGoogleMock(&argc, argv);
absl::ParseCommandLine(argc, argv); // Before parsing the arguments with the absl flag library, any internal '-'
// characters will be converted to '_' characters to make sure the string is a
// valid attribute name.
std::vector<std::string> new_argv = ReplaceDashesWithUnderscores(argc, argv);
std::vector<char*> raw_new_argv = VectorOfStringsToVectorOfPointers(new_argv);
absl::ParseCommandLine(argc, &raw_new_argv[0]);
// This absl handler use unsupported features/instructions on Fuchsia // This absl handler use unsupported features/instructions on Fuchsia
#if !defined(WEBRTC_FUCHSIA) #if !defined(WEBRTC_FUCHSIA)

18
test/test_main_lib.cc
View file

@ -48,11 +48,19 @@
ABSL_FLAG(std::string, ABSL_FLAG(std::string,
NSTreatUnknownArgumentsAsOpen, NSTreatUnknownArgumentsAsOpen,
"", "",
"Intentionally ignored flag intended for iOS simulator."); "Intentionally ignored flag intended for iOS test runner.");
ABSL_FLAG(std::string, ABSL_FLAG(std::string,
ApplePersistenceIgnoreState, ApplePersistenceIgnoreState,
"", "",
"Intentionally ignored flag intended for iOS simulator."); "Intentionally ignored flag intended for iOS test runner.");
ABSL_FLAG(bool,
enable_run_ios_unittests_with_xctest,
false,
"Intentionally ignored flag intended for iOS test runner.");
ABSL_FLAG(bool,
write_compiled_tests_json_to_writable_path,
false,
"Intentionally ignored flag intended for iOS test runner.");
// This is the cousin of isolated_script_test_perf_output, but we can't dictate // This is the cousin of isolated_script_test_perf_output, but we can't dictate
// where to write on iOS so the semantics of this flag are a bit different. // where to write on iOS so the semantics of this flag are a bit different.
@ -64,6 +72,12 @@ ABSL_FLAG(
"described by histogram.proto in " "described by histogram.proto in "
"https://chromium.googlesource.com/catapult/."); "https://chromium.googlesource.com/catapult/.");
#elif defined(WEBRTC_FUCHSIA)
ABSL_FLAG(std::string, use_vulkan, "", "Intentionally ignored flag.");
#else
// TODO(bugs.webrtc.org/8115): Remove workaround when fixed.
ABSL_FLAG(bool, no_sandbox, false, "Intentionally ignored flag.");
ABSL_FLAG(bool, test_launcher_bot_mode, false, "Intentionally ignored flag.");
#endif #endif
ABSL_FLAG(std::string, ABSL_FLAG(std::string,

51
tools_webrtc/flags_compatibility.py
View file

@ -1,51 +0,0 @@
#!/usr/bin/env vpython3
# Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
import argparse
import logging
import subprocess
import sys
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--isolated-script-test-output')
parser.add_argument('--isolated-script-test-perf-output')
args, unrecognized_args = parser.parse_known_args()
test_command = _ForcePythonInterpreter(unrecognized_args)
if args.isolated_script_test_output:
test_command += [
'--isolated_script_test_output', args.isolated_script_test_output
]
if args.isolated_script_test_perf_output:
test_command += [
'--isolated_script_test_perf_output=' +
args.isolated_script_test_perf_output
]
logging.info('Running %r', test_command)
return subprocess.call(test_command)
def _ForcePythonInterpreter(cmd):
"""Returns the fixed command line to call the right python executable."""
out = cmd[:]
if len(out) > 0:
if out[0] == 'python':
out[0] = sys.executable
elif out[0].endswith('.py'):
out.insert(0, sys.executable)
return out
if __name__ == '__main__':
logging.basicConfig(level=logging.INFO)
sys.exit(main())

24
tools_webrtc/gtest-parallel-wrapper.py
View file

@ -63,7 +63,7 @@ Will be converted into:
--test_artifacts_dir=SOME_OUTPUT_DIR/test_artifacts \ --test_artifacts_dir=SOME_OUTPUT_DIR/test_artifacts \
--some_flag=some_value \ --some_flag=some_value \
--another_flag \ --another_flag \
--isolated_script_test_perf_output=SOME_OTHER_DIR \ --isolated-script-test-perf-output=SOME_OTHER_DIR \
--foo=bar \ --foo=bar \
--baz --baz
@ -155,32 +155,12 @@ def ParseArgs(argv=None):
# know what will be the swarming output dir. # know what will be the swarming output dir.
parser.add_argument('--store-test-artifacts', action='store_true') parser.add_argument('--store-test-artifacts', action='store_true')
# No-sandbox is a Chromium-specific flag, ignore it.
# TODO(bugs.webrtc.org/8115): Remove workaround when fixed.
parser.add_argument('--no-sandbox',
action='store_true',
help=argparse.SUPPRESS)
parser.add_argument('executable') parser.add_argument('executable')
parser.add_argument('executable_args', nargs='*') parser.add_argument('executable_args', nargs='*')
options, unrecognized_args = parser.parse_known_args(argv) options, unrecognized_args = parser.parse_known_args(argv)
webrtc_flags_to_change = { executable_args = options.executable_args + unrecognized_args
'--isolated-script-test-perf-output':
'--isolated_script_test_perf_output',
'--isolated-script-test-output': '--isolated_script_test_output',
}
args_to_pass = []
for arg in unrecognized_args:
if any(arg.startswith(k) for k in list(webrtc_flags_to_change.keys())):
arg_split = arg.split('=')
args_to_pass.append(webrtc_flags_to_change[arg_split[0]] + '=' +
arg_split[1])
else:
args_to_pass.append(arg)
executable_args = options.executable_args + args_to_pass
if options.store_test_artifacts: if options.store_test_artifacts:
assert options.output_dir, ( assert options.output_dir, (

2
tools_webrtc/gtest_parallel_wrapper_test.py
View file

@ -146,7 +146,7 @@ class GtestParallelWrapperTest(unittest.TestCase):
'--output_dir=' + output_dir, '--dump_json_test_results=SOME_DIR', '--output_dir=' + output_dir, '--dump_json_test_results=SOME_DIR',
'some_test', '--', '--test_artifacts_dir=' + expected_artifacts_dir, 'some_test', '--', '--test_artifacts_dir=' + expected_artifacts_dir,
'--some_flag=some_value', '--another_flag', '--some_flag=some_value', '--another_flag',
'--isolated_script_test_perf_output=SOME_OTHER_DIR', '--foo=bar', '--isolated-script-test-perf-output=SOME_OTHER_DIR', '--foo=bar',
'--baz' '--baz'
]) ])
self.assertEqual(result.gtest_parallel_args, expected) self.assertEqual(result.gtest_parallel_args, expected)

18
tools_webrtc/mb/mb.py
View file

@ -53,8 +53,9 @@ class WebRTCMetaBuildWrapper(mb.MetaBuildWrapper):
is_android = 'target_os="android"' in vals['gn_args'] is_android = 'target_os="android"' in vals['gn_args']
is_fuchsia = 'target_os="fuchsia"' in vals['gn_args'] is_fuchsia = 'target_os="fuchsia"' in vals['gn_args']
is_linux = self.platform.startswith('linux') and not is_android
is_ios = 'target_os="ios"' in vals['gn_args'] is_ios = 'target_os="ios"' in vals['gn_args']
is_linux = self.platform.startswith('linux') and not is_android
is_win = self.platform.startswith('win')
if test_type == 'nontest': if test_type == 'nontest':
self.WriteFailureAndRaise('We should not be isolating %s.' % target, self.WriteFailureAndRaise('We should not be isolating %s.' % target,
@ -87,16 +88,11 @@ class WebRTCMetaBuildWrapper(mb.MetaBuildWrapper):
'../../.task_template_packages/logdog_butler', '--logcat-output-file', '../../.task_template_packages/logdog_butler', '--logcat-output-file',
'${ISOLATED_OUTDIR}/logcats', '--store-tombstones' '${ISOLATED_OUTDIR}/logcats', '--store-tombstones'
] ]
elif is_ios or is_fuchsia: elif is_ios or is_fuchsia or test_type == 'raw':
cmdline += [ if is_win:
vpython_exe, '../../tools_webrtc/flags_compatibility.py', cmdline += ['bin\\run_{}.bat'.format(target)]
'bin/run_%s' % target else:
] cmdline += ['bin/run_{}'.format(target)]
extra_files.append('../../tools_webrtc/flags_compatibility.py')
elif test_type == 'raw':
cmdline += [vpython_exe, '../../tools_webrtc/flags_compatibility.py']
extra_files.append('../../tools_webrtc/flags_compatibility.py')
cmdline.append(_GetExecutable(target, self.platform))
else: else:
if isolate_map[target].get('use_webcam', False): if isolate_map[target].get('use_webcam', False):
cmdline += [ cmdline += [

12
tools_webrtc/mb/mb_unittest.py
View file

@ -91,10 +91,11 @@ class FakeMBW(mb.WebRTCMetaBuildWrapper):
abpath = self._AbsPath(path) abpath = self._AbsPath(path)
self.files[abpath] = contents self.files[abpath] = contents
def Call(self, cmd, env=None, capture_output=True, stdin=None): def Call(self, cmd, env=None, capture_output=True, input=None):
# pylint: disable=redefined-builtin
del env del env
del capture_output del capture_output
del stdin del input
self.calls.append(cmd) self.calls.append(cmd)
if self.cmds: if self.cmds:
return self.cmds.pop(0) return self.cmds.pop(0)
@ -495,14 +496,9 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, [ self.assertEqual(files, [
'../../.vpython3', '../../.vpython3',
'../../testing/test_env.py', '../../testing/test_env.py',
'../../tools_webrtc/flags_compatibility.py',
'foo_unittests', 'foo_unittests',
]) ])
self.assertEqual(command, [ self.assertEqual(command, ['bin/run_foo_unittests'])
'vpython3',
'../../tools_webrtc/flags_compatibility.py',
'./foo_unittests',
])
def test_gen_non_parallel_console_test_launcher(self): def test_gen_non_parallel_console_test_launcher(self):
test_files = { test_files = {