| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
|
| index b0bba91b59d3f92e716c9f893a9a161c421b9352..26d6f818c42e536fe0f1ea2655c1e9acd771af6e 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
|
| @@ -173,9 +173,9 @@
|
| "[SLAVE_BUILD]/src/out/Debug/common_video_unittests.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/libjingle_media_unittest.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/libjingle_p2p_unittest.isolated.gen.json",
|
| - "[SLAVE_BUILD]/src/out/Debug/libjingle_peerconnection_unittest.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/modules_tests.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/modules_unittests.isolated.gen.json",
|
| + "[SLAVE_BUILD]/src/out/Debug/peerconnection_unittests.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/rtc_unittests.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/system_wrappers_unittests.isolated.gen.json",
|
| "[SLAVE_BUILD]/src/out/Debug/test_support_unittests.isolated.gen.json",
|
| @@ -192,9 +192,9 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"libjingle_media_unittest\": \"[dummy hash for libjingle_media_unittest]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"libjingle_p2p_unittest\": \"[dummy hash for libjingle_p2p_unittest]\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"libjingle_peerconnection_unittest\": \"[dummy hash for libjingle_peerconnection_unittest]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"modules_tests\": \"[dummy hash for modules_tests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"modules_unittests\": \"[dummy hash for modules_unittests]\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", @@@",
|
| @@ -203,7 +203,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", \"libjingle_media_unittest\": \"[dummy hash for libjingle_media_unittest]\", \"libjingle_p2p_unittest\": \"[dummy hash for libjingle_p2p_unittest]\", \"libjingle_peerconnection_unittest\": \"[dummy hash for libjingle_peerconnection_unittest]\", \"modules_tests\": \"[dummy hash for modules_tests]\", \"modules_unittests\": \"[dummy hash for modules_unittests]\", \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", \"tools_unittests\": \"[dummy hash for tools_unittests]\", \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\"}@@@"
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", \"libjingle_media_unittest\": \"[dummy hash for libjingle_media_unittest]\", \"libjingle_p2p_unittest\": \"[dummy hash for libjingle_p2p_unittest]\", \"modules_tests\": \"[dummy hash for modules_tests]\", \"modules_unittests\": \"[dummy hash for modules_unittests]\", \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", \"tools_unittests\": \"[dummy hash for tools_unittests]\", \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -611,7 +611,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "libjingle_peerconnection_unittest/Ubuntu/[dummy has/linux_swarming/-1",
|
| + "modules_tests/Ubuntu/[dummy has/linux_swarming/-1",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -635,11 +635,11 @@
|
| "--tag",
|
| "buildername:linux_swarming",
|
| "--tag",
|
| - "data:[dummy hash for libjingle_peerconnection_unittest]",
|
| + "data:[dummy hash for modules_tests]",
|
| "--tag",
|
| "master:tryserver.webrtc",
|
| "--tag",
|
| - "name:libjingle_peerconnection_unittest",
|
| + "name:modules_tests",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| @@ -653,17 +653,17 @@
|
| "--tag",
|
| "slavename:slavename",
|
| "--tag",
|
| - "stepname:libjingle_peerconnection_unittest on Ubuntu",
|
| + "stepname:modules_tests on Ubuntu",
|
| "--idempotent",
|
| - "[dummy hash for libjingle_peerconnection_unittest]"
|
| + "[dummy hash for modules_tests]"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] libjingle_peerconnection_unittest on Ubuntu",
|
| + "name": "[trigger] modules_tests on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"libjingle_peerconnection_unittest/Ubuntu/[dummy has/linux_swarming/-1\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"modules_tests/Ubuntu/[dummy has/linux_swarming/-1\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"libjingle_peerconnection_unittest/Ubuntu/[dummy has/linux_swarming/-1\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"modules_tests/Ubuntu/[dummy has/linux_swarming/-1\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -689,7 +689,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "modules_tests/Ubuntu/[dummy has/linux_swarming/-1",
|
| + "modules_unittests/Ubuntu/[dummy has/linux_swarming/-1",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -713,11 +713,11 @@
|
| "--tag",
|
| "buildername:linux_swarming",
|
| "--tag",
|
| - "data:[dummy hash for modules_tests]",
|
| + "data:[dummy hash for modules_unittests]",
|
| "--tag",
|
| "master:tryserver.webrtc",
|
| "--tag",
|
| - "name:modules_tests",
|
| + "name:modules_unittests",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| @@ -731,17 +731,17 @@
|
| "--tag",
|
| "slavename:slavename",
|
| "--tag",
|
| - "stepname:modules_tests on Ubuntu",
|
| + "stepname:modules_unittests on Ubuntu",
|
| "--idempotent",
|
| - "[dummy hash for modules_tests]"
|
| + "[dummy hash for modules_unittests]"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] modules_tests on Ubuntu",
|
| + "name": "[trigger] modules_unittests on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"modules_tests/Ubuntu/[dummy has/linux_swarming/-1\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"modules_unittests/Ubuntu/[dummy has/linux_swarming/-1\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"modules_tests/Ubuntu/[dummy has/linux_swarming/-1\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"modules_unittests/Ubuntu/[dummy has/linux_swarming/-1\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -767,7 +767,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "modules_unittests/Ubuntu/[dummy has/linux_swarming/-1",
|
| + "peerconnection_unittests/Ubuntu/[dummy has/linux_swarming/-1",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -791,11 +791,11 @@
|
| "--tag",
|
| "buildername:linux_swarming",
|
| "--tag",
|
| - "data:[dummy hash for modules_unittests]",
|
| + "data:[dummy hash for peerconnection_unittests]",
|
| "--tag",
|
| "master:tryserver.webrtc",
|
| "--tag",
|
| - "name:modules_unittests",
|
| + "name:peerconnection_unittests",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| @@ -809,17 +809,17 @@
|
| "--tag",
|
| "slavename:slavename",
|
| "--tag",
|
| - "stepname:modules_unittests on Ubuntu",
|
| + "stepname:peerconnection_unittests on Ubuntu",
|
| "--idempotent",
|
| - "[dummy hash for modules_unittests]"
|
| + "[dummy hash for peerconnection_unittests]"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] modules_unittests on Ubuntu",
|
| + "name": "[trigger] peerconnection_unittests on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"modules_unittests/Ubuntu/[dummy has/linux_swarming/-1\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"peerconnection_unittests/Ubuntu/[dummy has/linux_swarming/-1\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"modules_unittests/Ubuntu/[dummy has/linux_swarming/-1\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"peerconnection_unittests/Ubuntu/[dummy has/linux_swarming/-1\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -1624,12 +1624,12 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "libjingle_peerconnection_unittest/Ubuntu/[dummy has/linux_swarming/-1",
|
| + "modules_tests/Ubuntu/[dummy has/linux_swarming/-1",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "libjingle_peerconnection_unittest on Ubuntu",
|
| + "name": "modules_tests on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1682,12 +1682,12 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "modules_tests/Ubuntu/[dummy has/linux_swarming/-1",
|
| + "modules_unittests/Ubuntu/[dummy has/linux_swarming/-1",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "modules_tests on Ubuntu",
|
| + "name": "modules_unittests on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1740,12 +1740,12 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "modules_unittests/Ubuntu/[dummy has/linux_swarming/-1",
|
| + "peerconnection_unittests/Ubuntu/[dummy has/linux_swarming/-1",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "modules_unittests on Ubuntu",
|
| + "name": "peerconnection_unittests on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
|
|