| Index: scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.json b/scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.json
|
| index 23b08af52f760dbc8ecaa9597c812558b1dc646b..b8a74b935cfb9d877fd0b2ef8b3823dab7e8b6d8 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.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",
|
| "Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -133,33 +131,33 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/chromeos/bin/chromeos_make",
|
| + "[CWD]/skia/platform_tools/chromeos/bin/chromeos_make",
|
| "-d",
|
| "link",
|
| "dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| "PATH": "%(PATH)s:/home/chrome-bot/depot_tools/third_party/gsutil",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "build dm"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/chromeos/bin/chromeos_make",
|
| + "[CWD]/skia/platform_tools/chromeos/bin/chromeos_make",
|
| "-d",
|
| "link",
|
| "nanobench"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| "PATH": "%(PATH)s:/home/chrome-bot/depot_tools/third_party/gsutil",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "build nanobench"
|
| },
|
| @@ -173,11 +171,10 @@
|
| "-rf",
|
| "/usr/local/skiabot/bin"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "rmdir bin"
|
| },
|
| @@ -191,25 +188,23 @@
|
| "-p",
|
| "/usr/local/skiabot/bin"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "mkdir bin"
|
| },
|
| {
|
| "cmd": [
|
| "RECIPE_MODULE[build::skia]/resources/scp_dir_contents.sh",
|
| - "[SLAVE_BUILD]/skia/resources",
|
| + "[CWD]/skia/resources",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_resources"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp resources"
|
| },
|
| @@ -218,10 +213,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@@@@",
|
| @@ -241,10 +235,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"
|
| },
|
| {
|
| @@ -252,10 +245,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"
|
| },
|
| {
|
| @@ -267,11 +259,10 @@
|
| "cat",
|
| "/usr/local/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "read SKP_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| @@ -286,11 +277,10 @@
|
| "-f",
|
| "/usr/local/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "rm SKP_VERSION"
|
| },
|
| @@ -304,11 +294,10 @@
|
| "-rf",
|
| "/usr/local/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "rmdir skps"
|
| },
|
| @@ -322,25 +311,23 @@
|
| "-p",
|
| "/usr/local/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "mkdir skps"
|
| },
|
| {
|
| "cmd": [
|
| "RECIPE_MODULE[build::skia]/resources/scp_dir_contents.sh",
|
| - "[SLAVE_BUILD]/playback/skps",
|
| + "[CWD]/playback/skps",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp skps"
|
| },
|
| @@ -349,14 +336,13 @@
|
| "scp",
|
| "-P",
|
| "22",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "[CWD]/tmp/SKP_VERSION",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp SKP_VERSION"
|
| },
|
| @@ -365,10 +351,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"
|
| },
|
| {
|
| @@ -376,10 +361,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"
|
| },
|
| {
|
| @@ -391,11 +375,10 @@
|
| "cat",
|
| "/usr/local/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "read SK_IMAGE_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| @@ -410,11 +393,10 @@
|
| "-f",
|
| "/usr/local/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "rm SK_IMAGE_VERSION"
|
| },
|
| @@ -428,11 +410,10 @@
|
| "-rf",
|
| "/usr/local/skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "rmdir skia_images"
|
| },
|
| @@ -446,25 +427,23 @@
|
| "-p",
|
| "/usr/local/skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "mkdir skia_images"
|
| },
|
| {
|
| "cmd": [
|
| "RECIPE_MODULE[build::skia]/resources/scp_dir_contents.sh",
|
| - "[SLAVE_BUILD]/images",
|
| + "[CWD]/images",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_images"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp images"
|
| },
|
| @@ -473,14 +452,13 @@
|
| "scp",
|
| "-P",
|
| "22",
|
| - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| + "[CWD]/tmp/SK_IMAGE_VERSION",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp SK_IMAGE_VERSION"
|
| },
|
| @@ -489,9 +467,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]/dm"
|
| + "[CWD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -509,10 +486,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]/dm",
|
| + "[CWD]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -537,11 +513,10 @@
|
| "-rf",
|
| "/usr/local/skiabot/skia_dm_out"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "rmdir skia_dm_out"
|
| },
|
| @@ -555,11 +530,10 @@
|
| "-p",
|
| "/usr/local/skiabot/skia_dm_out"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "mkdir skia_dm_out"
|
| },
|
| @@ -568,13 +542,13 @@
|
| "python",
|
| "-u",
|
| "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
|
| - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt"
|
| + "[CWD]/tmp/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "get uninteresting hashes",
|
| "~followup_annotations": [
|
| @@ -616,14 +590,13 @@
|
| "scp",
|
| "-P",
|
| "22",
|
| - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
|
| + "[CWD]/tmp/uninteresting_hashes.txt",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp uninteresting_hashes.txt"
|
| },
|
| @@ -632,14 +605,13 @@
|
| "scp",
|
| "-P",
|
| "22",
|
| - "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug/config/chromeos-link/Debug/dm",
|
| + "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug/config/chromeos-link/Debug/dm",
|
| "root@192.168.1.123:/usr/local/skiabot/bin/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp dm"
|
| },
|
| @@ -689,11 +661,10 @@
|
| "--nogpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "dm"
|
| },
|
| @@ -701,13 +672,12 @@
|
| "cmd": [
|
| "RECIPE_MODULE[build::skia]/resources/scp_dir_contents.sh",
|
| "root@192.168.1.123:/usr/local/skiabot/skia_dm_out",
|
| - "[SLAVE_BUILD]/dm"
|
| + "[CWD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp skia_dm_out"
|
| },
|
| @@ -716,20 +686,20 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
|
| - "[SLAVE_BUILD]/dm",
|
| + "[CWD]/dm",
|
| "164710",
|
| "Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug",
|
| "5",
|
| "",
|
| - "[SLAVE_BUILD]/skia/common/py/utils"
|
| + "[CWD]/skia/common/py/utils"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto",
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "Upload DM Results"
|
| },
|
| @@ -738,14 +708,13 @@
|
| "scp",
|
| "-P",
|
| "22",
|
| - "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug/config/chromeos-link/Debug/nanobench",
|
| + "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug/config/chromeos-link/Debug/nanobench",
|
| "root@192.168.1.123:/usr/local/skiabot/bin/nanobench"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "scp nanobench"
|
| },
|
| @@ -766,11 +735,10 @@
|
| "--nogpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug"
|
| },
|
| "name": "nanobench"
|
| },
|
|
|