| Index: scripts/slave/recipes/skia/skia.expected/failed_dm.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/failed_dm.json b/scripts/slave/recipes/skia/skia.expected/failed_dm.json
|
| index 9b040944e100f60f5e2ac439ff85542f6c821e8e..0e76f0ce70322d69273ab61a41093f3a9dd3b559 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/failed_dm.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/failed_dm.json
|
| @@ -6,9 +6,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]"
|
| },
|
| @@ -29,7 +28,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -50,11 +48,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| + "[CWD]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -96,12 +94,12 @@
|
| "make",
|
| "dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_PATH": "[HOME]/src",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| },
|
| "name": "build dm"
|
| },
|
| @@ -110,12 +108,12 @@
|
| "make",
|
| "nanobench"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_PATH": "[HOME]/src",
|
| "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| },
|
| "name": "build nanobench"
|
| },
|
| @@ -124,10 +122,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@@@@",
|
| @@ -147,10 +144,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"
|
| },
|
| {
|
| @@ -158,10 +154,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"
|
| },
|
| {
|
| @@ -169,10 +164,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"
|
| },
|
| {
|
| @@ -180,10 +174,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"
|
| },
|
| {
|
| @@ -191,9 +184,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@@@@",
|
| @@ -211,10 +203,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@@@@",
|
| @@ -234,13 +225,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-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| },
|
| "name": "get uninteresting hashes",
|
| "~followup_annotations": [
|
| @@ -280,14 +271,14 @@
|
| {
|
| "cmd": [
|
| "catchsegv",
|
| - "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/Debug/dm",
|
| + "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/Debug/dm",
|
| "--undefok",
|
| "--resourcePath",
|
| - "[SLAVE_BUILD]/skia/resources",
|
| + "[CWD]/skia/resources",
|
| "--skps",
|
| - "[SLAVE_BUILD]/playback/skps",
|
| + "[CWD]/playback/skps",
|
| "--images",
|
| - "[SLAVE_BUILD]/images/dm",
|
| + "[CWD]/images/dm",
|
| "--nameByHash",
|
| "--properties",
|
| "gitHash",
|
| @@ -314,15 +305,14 @@
|
| "os",
|
| "Ubuntu",
|
| "--writePath",
|
| - "[SLAVE_BUILD]/dm",
|
| + "[CWD]/dm",
|
| "--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-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| },
|
| "name": "dm",
|
| "~followup_annotations": [
|
| @@ -335,42 +325,41 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
|
| - "[SLAVE_BUILD]/dm",
|
| + "[CWD]/dm",
|
| "164710",
|
| "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
|
| "6",
|
| "",
|
| - "[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-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| },
|
| "name": "Upload DM Results"
|
| },
|
| {
|
| "cmd": [
|
| "catchsegv",
|
| - "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/Debug/nanobench",
|
| + "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/Debug/nanobench",
|
| "--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",
|
| "--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-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
|
| },
|
| "name": "nanobench"
|
| },
|
|
|