| Index: scripts/slave/recipes/chromium_trybot.expected/telemetry_gpu_harness_failure.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json b/scripts/slave/recipes/chromium_trybot.expected/telemetry_gpu_harness_failure.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/telemetry_gpu_harness_failure.json
|
| index aef20a9fd12f9810695e1e56d71ed0e715a4c750..2949bc539eb79525facb14ce5536de851ccef53f 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/telemetry_gpu_harness_failure.json
|
| @@ -103,18 +103,7 @@
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"gl_tests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -143,27 +132,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[isolate]/resources/find_isolated_tests.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "find isolated tests",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| "killall",
|
| "-9",
|
| "gnome-keyring-daemon"
|
| @@ -200,12 +168,13 @@
|
| "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"base\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"exclusions\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"f.*\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ios\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| @@ -215,13 +184,90 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "import sys; sys.exit(0)"
|
| + "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "analyze",
|
| + "-m",
|
| + "tryserver.chromium.linux",
|
| + "-b",
|
| + "linux_chromium_rel_ng",
|
| + "-v",
|
| + "//out/Release",
|
| + "{\"files\": [\"foo.cc\"], \"targets\": [\"angle_unittests_run\", \"chrome\", \"chromium_swarm_tests\", \"content_gl_tests_run\", \"gl_tests_run\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_test_run\"]}",
|
| + "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "analyze",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
|
| - "@@@STEP_LOG_END@excluded_files@@@"
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chromium_builder_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chromium_builder_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@{@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"original_compile_targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"original_exes\": [@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.matching_exes\": [@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ ]@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@}@@@",
|
| + "@@@STEP_LOG_END@analyze_details@@@"
|
| ]
|
| },
|
| {
|
| @@ -260,7 +306,7 @@
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| "--swarming-targets-file",
|
| - "gl_tests\ncontent_gl_tests\ngl_tests\nangle_unittests\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntab_capture_end2end_tests\ngl_tests\n",
|
| + "content_gl_tests\ngl_tests\nangle_unittests\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntab_capture_end2end_tests\n",
|
| "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -287,9 +333,8 @@
|
| "--",
|
| "angle_unittests_run",
|
| "chrome",
|
| - "chromium_swarm_tests",
|
| + "chromium_builder_tests",
|
| "content_gl_tests_run",
|
| - "gl_tests",
|
| "gl_tests_run",
|
| "tab_capture_end2end_tests_run",
|
| "telemetry_gpu_test_run"
|
| @@ -356,90 +401,6 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
|
| - "--dump-json",
|
| - "/path/to/tmp/json",
|
| - "--expiration",
|
| - "3600",
|
| - "--io-timeout",
|
| - "1200",
|
| - "--hard-timeout",
|
| - "3600",
|
| - "--dimension",
|
| - "cpu",
|
| - "x86-64",
|
| - "--dimension",
|
| - "gpu",
|
| - "none",
|
| - "--dimension",
|
| - "os",
|
| - "Ubuntu-12.04",
|
| - "--dimension",
|
| - "pool",
|
| - "Chrome",
|
| - "--tag",
|
| - "buildername:linux_chromium_rel_ng",
|
| - "--tag",
|
| - "buildnumber:571",
|
| - "--tag",
|
| - "data:[dummy hash for gl_tests]",
|
| - "--tag",
|
| - "master:tryserver.chromium.linux",
|
| - "--tag",
|
| - "name:gl_tests (with patch)",
|
| - "--tag",
|
| - "os:Ubuntu-12.04",
|
| - "--tag",
|
| - "patch_project:chromium",
|
| - "--tag",
|
| - "project:chromium",
|
| - "--tag",
|
| - "purpose:CQ",
|
| - "--tag",
|
| - "purpose:pre-commit",
|
| - "--tag",
|
| - "rietveld:https://codereview.chromium.org/12853011/#ps1",
|
| - "--tag",
|
| - "stepname:gl_tests (with patch)",
|
| - "--idempotent",
|
| - "--user",
|
| - "commit-bot@chromium.org",
|
| - "[dummy hash for gl_tests]",
|
| - "--",
|
| - "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] gl_tests (with patch)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {@@@",
|
| - "@@@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\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| - "trigger",
|
| - "--swarming",
|
| - "https://chromium-swarm.appspot.com",
|
| - "--isolate-server",
|
| - "https://isolateserver.appspot.com",
|
| - "--priority",
|
| - "30",
|
| - "--shards",
|
| - "1",
|
| - "--task-name",
|
| "content_gl_tests on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| @@ -1749,61 +1710,6 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "gl_tests (with patch)",
|
| - "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
|
| - "@@@STEP_FAILURE@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[test_results]/resources/upload_gtest_test_results.py",
|
| - "--input-gtest-json",
|
| - "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
|
| - "--master-name",
|
| - "tryserver.chromium.linux",
|
| - "--builder-name",
|
| - "linux_chromium_rel_ng",
|
| - "--build-number",
|
| - "571",
|
| - "--test-type",
|
| - "gl_tests (with patch)",
|
| - "--test-results-server",
|
| - "test-results.appspot.com",
|
| - "--webkit-revision",
|
| - "0",
|
| - "--chrome-revision",
|
| - "170242"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Upload to test-results [gl_tests (with patch)]"
|
| - },
|
| - {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[swarming]/resources/collect_gtest_task.py",
|
| - "--swarming-client-dir",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client",
|
| - "--temp-root-dir",
|
| - "[TMP_BASE]",
|
| - "--merged-test-output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "collect",
|
| - "--swarming",
|
| - "https://chromium-swarm.appspot.com",
|
| - "--decorate",
|
| - "--print-status-updates",
|
| - "--shards",
|
| - "1",
|
| "content_gl_tests on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -1953,11 +1859,14 @@
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
|
| "~followup_annotations": [
|
| + "step returned non-zero exit code: 255",
|
| + "@@@STEP_TEXT@<br/>failures:<br/>maps_pixel_test on NVIDIA GPU on Linux (entire test suite)<br/>@@@",
|
| "@@@STEP_LOG_LINE@outdir_json@{@@@",
|
| - "@@@STEP_LOG_LINE@outdir_json@ \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
|
| - "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"0/results.json\": \"{\\\"per_page_values\\\": [], \\\"pages\\\": {}}\", @@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": true}]}\"@@@",
|
| "@@@STEP_LOG_LINE@outdir_json@}@@@",
|
| - "@@@STEP_LOG_END@outdir_json@@@"
|
| + "@@@STEP_LOG_END@outdir_json@@@",
|
| + "@@@STEP_FAILURE@@@"
|
| ]
|
| },
|
| {
|
| @@ -2344,7 +2253,7 @@
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| "--swarming-targets-file",
|
| - "gl_tests\n",
|
| + "telemetry_gpu_test\n",
|
| "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -2369,8 +2278,8 @@
|
| "--goma-disable-local-fallback",
|
| "--ninja-ensure-up-to-date",
|
| "--",
|
| - "gl_tests",
|
| - "gl_tests_run"
|
| + "chrome",
|
| + "telemetry_gpu_test_run"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "compile (without patch)"
|
| @@ -2427,7 +2336,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
|
| + "maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -2441,10 +2350,10 @@
|
| "x86-64",
|
| "--dimension",
|
| "gpu",
|
| - "none",
|
| + "10de:104a",
|
| "--dimension",
|
| "os",
|
| - "Ubuntu-12.04",
|
| + "Linux",
|
| "--dimension",
|
| "pool",
|
| "Chrome",
|
| @@ -2453,13 +2362,15 @@
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| - "data:[dummy hash for gl_tests]",
|
| + "data:[dummy hash for telemetry_gpu_test]",
|
| + "--tag",
|
| + "gpu_test:1",
|
| "--tag",
|
| "master:tryserver.chromium.linux",
|
| "--tag",
|
| - "name:gl_tests (without patch)",
|
| + "name:maps_pixel_test on NVIDIA GPU on Linux (without patch)",
|
| "--tag",
|
| - "os:Ubuntu-12.04",
|
| + "os:Linux",
|
| "--tag",
|
| "patch_project:chromium",
|
| "--tag",
|
| @@ -2471,22 +2382,34 @@
|
| "--tag",
|
| "rietveld:https://codereview.chromium.org/12853011/#ps1",
|
| "--tag",
|
| - "stepname:gl_tests (without patch)",
|
| - "--idempotent",
|
| + "stepname:maps_pixel_test on NVIDIA GPU on Linux (without patch) on Linux",
|
| "--user",
|
| "commit-bot@chromium.org",
|
| - "[dummy hash for gl_tests]",
|
| + "[dummy hash for telemetry_gpu_test]",
|
| "--",
|
| - "--gtest_filter=Test.Two",
|
| - "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| + "maps",
|
| + "--show-stdout",
|
| + "--browser=release",
|
| + "-v",
|
| + "--use-devtools-active-port",
|
| + "--build-revision",
|
| + "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| + "--test-machine-name",
|
| + "linux_chromium_rel_ng",
|
| + "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
|
| + "--story-filter=maps\\_pixel\\_test\\ on\\ NVIDIA\\ GPU\\ on\\ Linux\\ \\(entire\\ test\\ suite\\)",
|
| + "--output-format",
|
| + "json",
|
| + "--output-dir",
|
| + "${ISOLATED_OUTDIR}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] gl_tests (without patch)",
|
| + "name": "[trigger] maps_pixel_test on NVIDIA GPU on Linux (without patch) on Linux",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
|
| "@@@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\"@@@",
|
| @@ -2498,18 +2421,10 @@
|
| ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[swarming]/resources/collect_gtest_task.py",
|
| - "--swarming-client-dir",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client",
|
| - "--temp-root-dir",
|
| - "[TMP_BASE]",
|
| - "--merged-test-output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| + "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -2517,35 +2432,19 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "gl_tests (without patch)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[test_results]/resources/upload_gtest_test_results.py",
|
| - "--input-gtest-json",
|
| - "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}]}",
|
| - "--master-name",
|
| - "tryserver.chromium.linux",
|
| - "--builder-name",
|
| - "linux_chromium_rel_ng",
|
| - "--build-number",
|
| - "571",
|
| - "--test-type",
|
| - "gl_tests (without patch)",
|
| - "--test-results-server",
|
| - "test-results.appspot.com",
|
| - "--webkit-revision",
|
| - "0",
|
| - "--chrome-revision",
|
| - "170242"
|
| + "maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
|
| + "--task-output-dir",
|
| + "/path/to/tmp/"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "Upload to test-results [gl_tests (without patch)]"
|
| + "name": "maps_pixel_test on NVIDIA GPU on Linux (without patch) on Linux",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@outdir_json@{@@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
|
| + "@@@STEP_LOG_LINE@outdir_json@}@@@",
|
| + "@@@STEP_LOG_END@outdir_json@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -2554,18 +2453,18 @@
|
| "import sys; sys.exit(1)"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "gl_tests",
|
| + "name": "maps_pixel_test on NVIDIA GPU on Linux",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| - "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
|
| + "@@@STEP_TEXT@<br/>failures:<br/>maps_pixel_test on NVIDIA GPU on Linux (entire test suite)<br/>@@@",
|
| "@@@STEP_FAILURE@@@",
|
| "@@@SET_BUILD_PROPERTY@failure_type@\"TEST_FAILURE\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@failure_hash@\"219632d5cbb4c4bca9faaa20654f18f250ab3f81\"@@@"
|
| + "@@@SET_BUILD_PROPERTY@failure_hash@\"ee830a073deb60c4db65dd980b11aa053a98ba25\"@@@"
|
| ]
|
| },
|
| {
|
| "name": "$final_result",
|
| - "reason": "1 out of 1 aggregated steps failed. Failures: Step('gl_tests') failed with return_code 1",
|
| + "reason": "1 out of 1 aggregated steps failed. Failures: Step('maps_pixel_test on NVIDIA GPU on Linux') failed with return_code 1",
|
| "status_code": 1
|
| }
|
| ]
|
|
|