| Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| similarity index 64%
|
| copy from scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json
|
| copy to scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| index 9d2c3aa348981093a258469102d20582e6486310..02fffe6febb38349930f18dd0528a16b57752397 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| @@ -123,37 +123,42 @@
|
| "-u",
|
| "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| - "Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot"
|
| + "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
|
| ],
|
| "cwd": "[SLAVE_BUILD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Swarming\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Coverage\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Coverage\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"do_compile_steps\": false, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang-3.6\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++-3.6\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| @@ -411,6 +416,73 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[SLAVE_BUILD]/tmp",
|
| + "511"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "makedirs tmp_dir",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Get downloaded SKP_VERSION"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Get expected SKP_VERSION"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Get downloaded SK_IMAGE_VERSION"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Get expected SK_IMAGE_VERSION"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| @@ -434,11 +506,11 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/coverage_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "Write compile_skia.isolated.gen.json"
|
| + "name": "Write test_skia.isolated.gen.json"
|
| },
|
| {
|
| "cmd": [
|
| @@ -452,16 +524,16 @@
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| + "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia\": \"[dummy hash for compile_skia]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_skia\": \"[dummy hash for test_skia]\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"compile_skia\": \"[dummy hash for compile_skia]\"}@@@"
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test_skia\": \"[dummy hash for test_skia]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -469,7 +541,7 @@
|
| "python",
|
| "-u",
|
| "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated",
|
| "[dummy hash for isolate_recipes]"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -495,10 +567,10 @@
|
| "archive",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated"
|
| + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "upload new .isolated file for compile_skia",
|
| + "name": "upload new .isolated file for test_skia",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| @@ -516,7 +588,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot/5",
|
| + "test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -524,7 +596,7 @@
|
| "--io-timeout",
|
| "1200",
|
| "--hard-timeout",
|
| - "3600",
|
| + "10800",
|
| "--dimension",
|
| "gpu",
|
| "none",
|
| @@ -535,34 +607,33 @@
|
| "pool",
|
| "Skia",
|
| "--tag",
|
| - "buildername:Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot",
|
| + "buildername:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| "data:def456",
|
| "--tag",
|
| - "master:client.skia.fyi",
|
| + "master:client.skia",
|
| "--tag",
|
| - "name:compile_skia",
|
| + "name:test_skia",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| "rietveld:https://codereview.chromium.org/500/#ps1",
|
| "--tag",
|
| - "slavename:skiabot-linux-housekeeper-003",
|
| + "slavename:skiabot-linux-swarm-013",
|
| "--tag",
|
| - "stepname:compile_skia on Ubuntu",
|
| - "--idempotent",
|
| + "stepname:test_skia on Ubuntu",
|
| "def456",
|
| "--",
|
| "--workdir",
|
| "../../..",
|
| - "skia/swarm_compile",
|
| + "skia/swarm_test",
|
| "rietveld=https://codereview.chromium.org",
|
| - "buildername=Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot",
|
| - "mastername=client.skia.fyi",
|
| + "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
|
| + "mastername=client.skia",
|
| "buildnumber=5",
|
| - "slavename=skiabot-linux-housekeeper-003",
|
| + "slavename=skiabot-linux-swarm-013",
|
| "reason=Triggered by Skia swarm_trigger Recipe",
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "patchset=1",
|
| @@ -570,12 +641,12 @@
|
| "revision=164710"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] compile_skia on Ubuntu",
|
| + "name": "[trigger] test_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5\": {@@@",
|
| "@@@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\"@@@",
|
| @@ -590,6 +661,26 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "rmtree results_dir",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| @@ -598,12 +689,14 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot/5",
|
| + "test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5",
|
| "--task-summary-json",
|
| - "/path/to/tmp/json"
|
| + "/path/to/tmp/json",
|
| + "--task-output-dir",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "compile_skia on Ubuntu",
|
| + "name": "test_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -648,6 +741,137 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [
|
| + "git",
|
| + "show",
|
| + "HEAD",
|
| + "--format=%at",
|
| + "-s"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/skia",
|
| + "name": "git show",
|
| + "stdout": "/path/to/tmp/"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/164710.cov",
|
| + "gs://skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/164710.cov"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "AWS_CREDENTIAL_FILE": null,
|
| + "BOTO_CONFIG": null
|
| + },
|
| + "name": "gsutil upload raw coverage data",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/164710.cov@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_164710.json",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_164710_1408633190.json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "nanobench JSON"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_164710.json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "old nanobench JSON",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::skia]/resources/upload_bench_results.py",
|
| + "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
|
| + "5",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0",
|
| + "164710",
|
| + "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
|
| + "500"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/skia",
|
| + "env": {
|
| + "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| + "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
|
| + },
|
| + "name": "upload nanobench coverage results"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710.json",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710_1408633190.json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Line-by-line coverage JSON"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710.json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "old line-by-line coverage JSON",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710_1408633190.json",
|
| + "gs://skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_164710_1408633190.json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "AWS_CREDENTIAL_FILE": null,
|
| + "BOTO_CONFIG": null
|
| + },
|
| + "name": "gsutil upload line-by-line coverage data",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_164710_1408633190.json@@@"
|
| + ]
|
| + },
|
| + {
|
| "name": "$result",
|
| "recipe_result": null,
|
| "status_code": 0
|
|
|