| Index: infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| deleted file mode 100644
|
| index 9098ea7280017db790fa2b730e8ea112b944840a..0000000000000000000000000000000000000000
|
| --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
|
| +++ /dev/null
|
| @@ -1,508 +0,0 @@
|
| -[
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
|
| - "/path/to/tmp/"
|
| - ],
|
| - "name": "Get downloaded SKP VERSION"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "42",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION"
|
| - ],
|
| - "name": "write SKP_VERSION"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
|
| - "/path/to/tmp/"
|
| - ],
|
| - "name": "Get downloaded skimage VERSION"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "42",
|
| - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
|
| - ],
|
| - "name": "write SK_IMAGE_VERSION"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
|
| - "/path/to/tmp/"
|
| - ],
|
| - "name": "Get downloaded SVG VERSION"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "42",
|
| - "[SLAVE_BUILD]/tmp/SVG_VERSION"
|
| - ],
|
| - "name": "write SVG_VERSION"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/skia/tools/llvm_coverage_build",
|
| - "dm"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| - "env": {
|
| - "BUILDTYPE": "Coverage",
|
| - "CC": "/usr/bin/clang-3.6",
|
| - "CHROME_HEADLESS": "1",
|
| - "CXX": "/usr/bin/clang++-3.6",
|
| - "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "build dm"
|
| - },
|
| - {
|
| - "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]/out/coverage_results"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
|
| - },
|
| - "name": "rmtree coverage_results",
|
| - "~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",
|
| - "\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]/out/coverage_results",
|
| - "511"
|
| - ],
|
| - "name": "makedirs coverage_results",
|
| - "~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",
|
| - "[SLAVE_BUILD]/skia/tools/llvm_coverage_run.py",
|
| - "dm",
|
| - "--undefok",
|
| - "--resourcePath",
|
| - "[SLAVE_BUILD]/skia/resources",
|
| - "--skps",
|
| - "[SLAVE_BUILD]/skp",
|
| - "--images",
|
| - "[SLAVE_BUILD]/skimage/dm",
|
| - "--colorImages",
|
| - "[SLAVE_BUILD]/skimage/colorspace",
|
| - "--nameByHash",
|
| - "--properties",
|
| - "gitHash",
|
| - "abc123",
|
| - "master",
|
| - "client.skia",
|
| - "builder",
|
| - "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
|
| - "build_number",
|
| - "5",
|
| - "issue",
|
| - "500",
|
| - "patchset",
|
| - "1",
|
| - "patch_storage",
|
| - "rietveld",
|
| - "--svgs",
|
| - "[SLAVE_BUILD]/svg",
|
| - "--key",
|
| - "arch",
|
| - "x86_64",
|
| - "compiler",
|
| - "Clang",
|
| - "configuration",
|
| - "Coverage",
|
| - "cpu_or_gpu",
|
| - "CPU",
|
| - "cpu_or_gpu_value",
|
| - "AVX2",
|
| - "model",
|
| - "GCE",
|
| - "os",
|
| - "Ubuntu",
|
| - "--nogpu",
|
| - "--config",
|
| - "8888",
|
| - "gpu",
|
| - "gpusrgb",
|
| - "pdf",
|
| - "msaa16",
|
| - "565",
|
| - "f16",
|
| - "srgb",
|
| - "sp-8888",
|
| - "2ndpic-8888",
|
| - "lite-8888",
|
| - "serialize-8888",
|
| - "tiles_rt-8888",
|
| - "pic-8888",
|
| - "--src",
|
| - "tests",
|
| - "gm",
|
| - "image",
|
| - "colorImage",
|
| - "svg",
|
| - "--blacklist",
|
| - "f16",
|
| - "_",
|
| - "_",
|
| - "dstreadshuffle",
|
| - "f16",
|
| - "image",
|
| - "_",
|
| - "_",
|
| - "srgb",
|
| - "image",
|
| - "_",
|
| - "_",
|
| - "gpusrgb",
|
| - "image",
|
| - "_",
|
| - "_",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bleed_image",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "c_gms",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "colortype",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "colortype_xfermodes",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "drawfilter",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "fontmgr_bounds_0.75_0",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "fontmgr_bounds_1_-0.25",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "fontmgr_bounds",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "fontmgr_match",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "fontmgr_iter",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "imagemasksubset",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bitmapfilters",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bitmapshaders",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bleed",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bleed_alpha_bmp",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bleed_alpha_bmp_shader",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "convex_poly_clip",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "extractalpha",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "filterbitmap_checkerboard_32_32_g8",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "filterbitmap_image_mandrill_64",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "shadows",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "simpleaaclip_aaclip",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "composeshader_bitmap",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "scaled_tilemodes_npot",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "scaled_tilemodes",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bleed_alpha_image",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "bleed_alpha_image_shader",
|
| - "sp-8888",
|
| - "gm",
|
| - "_",
|
| - "drawfilter",
|
| - "pic-8888",
|
| - "gm",
|
| - "_",
|
| - "drawfilter",
|
| - "2ndpic-8888",
|
| - "gm",
|
| - "_",
|
| - "drawfilter",
|
| - "lite-8888",
|
| - "gm",
|
| - "_",
|
| - "drawfilter",
|
| - "sp-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-picture",
|
| - "pic-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-picture",
|
| - "2ndpic-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-picture",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-picture",
|
| - "sp-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-raster",
|
| - "pic-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-raster",
|
| - "2ndpic-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-raster",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-raster",
|
| - "sp-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-ctable",
|
| - "pic-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-ctable",
|
| - "2ndpic-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-ctable",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "image-cacherator-from-ctable",
|
| - "sp-8888",
|
| - "gm",
|
| - "_",
|
| - "gamut",
|
| - "pic-8888",
|
| - "gm",
|
| - "_",
|
| - "gamut",
|
| - "lite-8888",
|
| - "gm",
|
| - "_",
|
| - "gamut",
|
| - "2ndpic-8888",
|
| - "gm",
|
| - "_",
|
| - "gamut",
|
| - "serialize-8888",
|
| - "gm",
|
| - "_",
|
| - "gamut",
|
| - "--outResultsFile",
|
| - "[SLAVE_BUILD]/out/coverage_results/abc123.cov"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| - "env": {
|
| - "BUILDTYPE": "Coverage",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "dm"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "[SLAVE_BUILD]/skia/tools/parse_llvm_coverage.py",
|
| - "--report",
|
| - "[SLAVE_BUILD]/out/coverage_results/abc123.cov",
|
| - "--nanobench",
|
| - "[SLAVE_BUILD]/out/coverage_results/nanobench_abc123.json",
|
| - "--linebyline",
|
| - "[SLAVE_BUILD]/out/coverage_results/coverage_by_line_abc123.json",
|
| - "--key",
|
| - "arch",
|
| - "x86_64",
|
| - "compiler",
|
| - "Clang",
|
| - "configuration",
|
| - "Coverage",
|
| - "cpu_or_gpu",
|
| - "CPU",
|
| - "cpu_or_gpu_value",
|
| - "AVX2",
|
| - "model",
|
| - "GCE",
|
| - "os",
|
| - "Ubuntu",
|
| - "--properties",
|
| - "gitHash",
|
| - "abc123",
|
| - "master",
|
| - "client.skia",
|
| - "builder",
|
| - "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
|
| - "build_number",
|
| - "5",
|
| - "issue",
|
| - "500",
|
| - "patchset",
|
| - "1",
|
| - "patch_storage",
|
| - "rietveld"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| - "env": {
|
| - "BUILDTYPE": "Coverage",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "Generate Coverage Data"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| - "[SLAVE_BUILD]/out/coverage_results",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "listdir results_dir",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@[@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@]@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/out/coverage_results/file 1",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]"
|
| - ],
|
| - "name": "Copy to swarming out"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/out/coverage_results/file 2",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]"
|
| - ],
|
| - "name": "Copy to swarming out (2)"
|
| - },
|
| - {
|
| - "name": "$result",
|
| - "recipe_result": null,
|
| - "status_code": 0
|
| - }
|
| -]
|
|
|