| Index: scripts/slave/recipes/skia/skia.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json b/scripts/slave/recipes/skia/skia.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json
|
| index 8d5d10e612124a497c22d1f8fa19ef9cca41b97b..35d77930ebf35c77cad71d2e9ef2eaca26e0c27f 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json
|
| @@ -7,7 +7,7 @@
|
| "origin",
|
| "https://skia.googlesource.com/skia.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git remote set-url"
|
| },
|
| {
|
| @@ -15,7 +15,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -25,7 +25,7 @@
|
| "--hard",
|
| "abc123"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git reset"
|
| },
|
| {
|
| @@ -35,7 +35,7 @@
|
| "-d",
|
| "-f"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -45,9 +45,8 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| + "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -68,7 +67,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -89,11 +87,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| + "[CWD]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -135,12 +133,12 @@
|
| "make",
|
| "visualbench"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROME_PATH": "[HOME]/src",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| },
|
| "name": "build visualbench"
|
| },
|
| @@ -149,10 +147,9 @@
|
| "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",
|
| + "[CWD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -172,10 +169,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "[CWD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -183,10 +179,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| + "[CWD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| @@ -194,10 +189,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| + "[CWD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -205,10 +199,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| + "[CWD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -216,9 +209,8 @@
|
| "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]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data"
|
| + "[CWD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree data",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -236,10 +228,9 @@
|
| "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]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| + "[CWD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs data",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -262,25 +253,25 @@
|
| "--format=%at",
|
| "-s"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git show",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| "cmd": [
|
| "catchsegv",
|
| - "[SLAVE_BUILD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/Release/visualbench",
|
| + "[CWD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/Release/visualbench",
|
| "--undefok",
|
| "-i",
|
| - "[SLAVE_BUILD]/skia/resources",
|
| + "[CWD]/skia/resources",
|
| "--skps",
|
| - "[SLAVE_BUILD]/playback/skps",
|
| + "[CWD]/playback/skps",
|
| "--images",
|
| - "[SLAVE_BUILD]/images/dm",
|
| + "[CWD]/images/dm",
|
| "--nocpu",
|
| "--dummy-flags",
|
| "--outResultsFile",
|
| - "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data/nanobench_164710_1408633190.json",
|
| + "[CWD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data/nanobench_164710_1408633190.json",
|
| "--properties",
|
| "gitHash",
|
| "164710",
|
| @@ -302,11 +293,10 @@
|
| "os",
|
| "Ubuntu"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| },
|
| "name": "visualbench"
|
| },
|
| @@ -315,10 +305,9 @@
|
| "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]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| + "[CWD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs perf_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -340,17 +329,17 @@
|
| "RECIPE_MODULE[build::skia]/resources/upload_bench_results.py",
|
| "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench",
|
| "5",
|
| - "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| + "[CWD]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data",
|
| "164710",
|
| - "[DEPOT_TOOLS]/third_party/gsutil/gsutil"
|
| + "[ROOT]/b/depot_tools/third_party/gsutil/gsutil"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench"
|
| },
|
| "name": "Upload visualbench Results"
|
| },
|
|
|