diff options
Diffstat (limited to 'infra/bots/recipes/swarm_test.expected')
31 files changed, 1220 insertions, 1220 deletions
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index bb5061f577..2de2cadb0e 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value MT6582 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut --match ~WritePixels; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json index 313ccf4e03..478db9a8a0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Mali400MP2 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~WritePixels; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json index 5e54973475..1883ff0ef5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config GN_Android model GalaxyS7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --threads 0 --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json index a84eb8d41a..b4fd5ab6b0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model NVIDIA_Shield os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gl gldft glsrgb glmsaa4 glinstdit4 serialize-8888 tiles_rt-8888 pic-8888 glinst --src tests gm image colorImage svg --blacklist glsrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json index 3f242a60b0..aa144e7533 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value MaliT604 extra_config GN_Android model Nexus10 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json index b08f03202a..6e58fd5dc9 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 esinst --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json index 942ba93b38..bb07359b71 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno430 extra_config GN_Android_Vulkan model Nexus6p os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config vk --src tests gm image colorImage svg --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~XfermodeImageFilterCroppedInput ~GrTextureStripAtlasFlush ~CopySurface; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json index cebfd771cb..317181c816 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json index d0dfddcaa5..c5968d4f19 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus9-CPU-Denver-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu CPU cpu_or_gpu_value Denver extra_config GN_Android model Nexus9 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpudft gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --noRAW_threading; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json index e58b2ac6e7..fc60b8e592 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch x86 compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value SSE4 extra_config GN_Android model NexusPlayer os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpusrgb --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape --match ~ResourceCache --noRAW_threading; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Release" + "[START_DIR]/out/Release" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json index 652b951441..aaa475c9ce 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -483,20 +483,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -505,7 +505,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb msaa4 esinstdit4 serialize-8888 tiles_rt-8888 pic-8888 esinst --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -513,10 +513,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -525,7 +525,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -560,7 +560,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -568,7 +568,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -595,7 +595,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index eae7d0348e..a1b382d445 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -213,7 +213,7 @@ "os", "Mac", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nocpu", @@ -583,7 +583,7 @@ "_", "blurcircles" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 15391a9e75..704d6790e7 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -213,7 +213,7 @@ "os", "Mac", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -485,7 +485,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index a4245ce7b1..21e42dc0e2 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -215,7 +215,7 @@ "os", "Mac", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nocpu", @@ -413,7 +413,7 @@ "_", ".SRW" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index b7c0126564..9ba4805257 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86", @@ -214,7 +214,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -468,7 +468,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 8a11d653c9..ac23721cac 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -82,7 +82,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -349,11 +349,11 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", - "PATH": "%(PATH)s:[SLAVE_BUILD]/clang_linux/bin", + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "dm" diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 1f38798bb9..50826cdbdb 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -82,7 +82,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -352,10 +352,10 @@ "~Once", "~Shared" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { - "LD_LIBRARY_PATH": "[SLAVE_BUILD]/clang_linux/msan", - "PATH": "%(PATH)s:[SLAVE_BUILD]/clang_linux/bin" + "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan", + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin" }, "name": "dm" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index d17a8d1a4f..690f74f05b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -214,7 +214,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -466,7 +466,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 0d2092a19b..8360a05fb9 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -216,7 +216,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -468,7 +468,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index a4a90c8917..61b492dd54 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,22 +55,22 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/out/Release/dm", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -82,7 +82,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -353,9 +353,9 @@ "~RGBA4444TextureTest", "~RGB565TextureTest" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { - "PATH": "%(PATH)s:[SLAVE_BUILD]/clang_linux/bin" + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin" }, "name": "dm" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index c49f5190bf..589091ed2b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,17 +67,17 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/dm", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -89,7 +89,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -412,7 +412,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, @@ -424,17 +424,17 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/dm", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -446,7 +446,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -770,7 +770,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm --abandonGpuContext" }, @@ -782,17 +782,17 @@ "--track-origins=yes", "--error-exitcode=1", "--num-callers=40", - "--suppressions=[SLAVE_BUILD]/skia/tools/valgrind.supp", - "[SLAVE_BUILD]/out/Release/dm", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -804,7 +804,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -1128,7 +1128,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm --preAbandonGpuContext" }, diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 786f1fc522..b44fc614c1 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -215,7 +215,7 @@ "os", "Win10", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nocpu", @@ -365,7 +365,7 @@ "_", ".SRW" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index a2cd633609..444eb7cce8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\dm", + "[START_DIR]\\out\\Release_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -202,7 +202,7 @@ "patch_storage", "rietveld", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -219,7 +219,7 @@ "os", "Win8", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", @@ -470,7 +470,7 @@ "gamut", "--noRAW_threading" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 1f79dbd209..7b5a76d0f5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Debug_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Debug_x64\\dm", + "[START_DIR]\\out\\Debug_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -196,7 +196,7 @@ "build_number", "5", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -215,7 +215,7 @@ "os", "Win8", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nocpu", @@ -379,7 +379,7 @@ "~GLPrograms", "--noRAW_threading" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 1802f66812..363e311740 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -1,27 +1,27 @@ [ { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" + "[START_DIR]/skia/platform_tools/ios/bin/ios_install" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "install iOSShell" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skia/resources", "skiabot/skia_resources" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push resources to skia_resources" }, @@ -30,7 +30,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -41,97 +41,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SKP_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skp to skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SKP_VERSION", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION" + "name": "push [START_DIR]/tmp/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -142,97 +142,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skimage to skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "name": "push [START_DIR]/tmp/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -243,90 +243,90 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SVG_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/svg", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push svg to svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SVG_VERSION", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + "name": "push [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ @@ -336,7 +336,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -374,27 +374,27 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_dm" }, @@ -403,7 +403,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -425,13 +425,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -470,21 +470,21 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/uninteresting_hashes.txt", "skiabot/skia_tmp_dir/uninteresting_hashes.txt" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", + "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", "--dm", "--undefok", "--resourcePath", @@ -903,34 +903,34 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_pull_if_needed", + "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "skiabot/skia_dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "pull skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart" + "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "reboot" }, @@ -942,8 +942,8 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "wait for reboot" }, diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index cd6118b6ea..f1deb65e10 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SKP_VERSION" + "[START_DIR]\\tmp\\SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION" + "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\svg\\VERSION", + "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]\\tmp\\SVG_VERSION" + "[START_DIR]\\tmp\\SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" + "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]\\tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]\\tmp\\uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]\\out" + "SKIA_OUT": "[START_DIR]\\out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -175,16 +175,16 @@ }, { "cmd": [ - "[SLAVE_BUILD]\\out\\Release_x64\\dm", + "[START_DIR]\\out\\Release_x64\\dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]\\skia\\resources", + "[START_DIR]\\skia\\resources", "--skps", - "[SLAVE_BUILD]\\skp", + "[START_DIR]\\skp", "--images", - "[SLAVE_BUILD]\\skimage\\dm", + "[START_DIR]\\skimage\\dm", "--colorImages", - "[SLAVE_BUILD]\\skimage\\colorspace", + "[START_DIR]\\skimage\\colorspace", "--nameByHash", "--properties", "gitHash", @@ -202,7 +202,7 @@ "patch_storage", "rietveld", "--svgs", - "[SLAVE_BUILD]\\svg", + "[START_DIR]\\svg", "--key", "arch", "x86_64", @@ -219,7 +219,7 @@ "os", "Win8", "--uninterestingHashesFile", - "[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt", + "[START_DIR]\\tmp\\uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", @@ -470,7 +470,7 @@ "gamut", "--noRAW_threading" ], - "cwd": "[SLAVE_BUILD]\\skia", + "cwd": "[START_DIR]\\skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index 900b8a6215..0ae65967ff 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -4,7 +4,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -15,7 +15,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -24,7 +24,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -35,7 +35,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -67,7 +67,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -108,7 +108,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -197,7 +197,7 @@ "build_number", "6", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86_64", @@ -214,7 +214,7 @@ "os", "Ubuntu", "--uninterestingHashesFile", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", @@ -466,7 +466,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm", "~followup_annotations": [ "step returned non-zero exit code: 1", diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 5f233db06d..0e79bff74e 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -7,7 +7,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" }, { @@ -15,11 +15,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -44,7 +44,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -55,7 +55,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -66,7 +66,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", "stdout": "/path/to/tmp/" }, @@ -78,7 +78,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" }, { @@ -89,7 +89,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/skps" }, { @@ -100,7 +100,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" }, { @@ -108,11 +108,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skp/* /sdcard/revenge_of_the_skiabot/skps", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -136,18 +136,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -158,7 +158,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -169,7 +169,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, @@ -181,7 +181,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" }, { @@ -192,7 +192,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/images" }, { @@ -203,7 +203,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/images" }, { @@ -211,11 +211,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/skimage/* /sdcard/revenge_of_the_skiabot/images", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -239,18 +239,18 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -261,7 +261,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -272,7 +272,7 @@ "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", "stdout": "/path/to/tmp/" }, @@ -284,7 +284,7 @@ "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { @@ -295,7 +295,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -306,7 +306,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" }, { @@ -314,11 +314,11 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/svg/* /sdcard/revenge_of_the_skiabot/svgs", + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@import os@@@", @@ -342,11 +342,11 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" }, { "cmd": [ @@ -356,7 +356,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -400,7 +400,7 @@ "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -411,7 +411,7 @@ "-p", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" }, { @@ -419,7 +419,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -441,9 +441,9 @@ "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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "get uninteresting hashes", "~followup_annotations": [ "step returned non-zero exit code: 1", @@ -485,20 +485,20 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/tmp/uninteresting_hashes.txt", "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" + "cwd": "[START_DIR]/skia", + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" }, { "cmd": [ "adb", "push", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm" }, { @@ -507,7 +507,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android build_number 6 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --config 8888 gpu gpudft gpusrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ _ test _ GrShape 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", - "[SLAVE_BUILD]/tmp/dm.sh" + "[START_DIR]/tmp/dm.sh" ], "name": "write dm.sh" }, @@ -515,10 +515,10 @@ "cmd": [ "adb", "push", - "[SLAVE_BUILD]/tmp/dm.sh", + "[START_DIR]/tmp/dm.sh", "/data/local/tmp/" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "push dm.sh" }, { @@ -527,7 +527,7 @@ "logcat", "-c" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "clear log" }, { @@ -562,7 +562,7 @@ "/sdcard/revenge_of_the_skiabot/dm_out", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm" }, { @@ -570,7 +570,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[SLAVE_BUILD]/out/Debug" + "[START_DIR]/out/Debug" ], "name": "dump log", "~followup_annotations": [ @@ -597,7 +597,7 @@ "adb", "kill-server" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "kill adb server" }, { diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json index d669f4664e..5294fbfdbe 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json @@ -1,27 +1,27 @@ [ { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" + "[START_DIR]/skia/platform_tools/ios/bin/ios_install" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "install iOSShell" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skia/resources", "skiabot/skia_resources" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push resources to skia_resources" }, @@ -30,7 +30,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -41,20 +41,20 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SKP_VERSION", "stdout": "/path/to/tmp/", @@ -65,77 +65,77 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SKP_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_skp/skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skp", "skiabot/skia_skp/skps" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skp to skps" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SKP_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SKP_VERSION", "skiabot/skia_tmp_dir/SKP_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SKP_VERSION" + "name": "push [START_DIR]/tmp/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", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -146,97 +146,97 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SK_IMAGE_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/skimage", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/skimage", "skiabot/skia_images" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push skimage to skia_images" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SK_IMAGE_VERSION", "skiabot/skia_tmp_dir/SK_IMAGE_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "name": "push [START_DIR]/tmp/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", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -247,90 +247,90 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_cat_file", + "[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "read SVG_VERSION", "stdout": "/path/to/tmp/" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rm skiabot/skia_tmp_dir/SVG_VERSION" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_svg/svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_if_needed", - "[SLAVE_BUILD]/svg", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed", + "[START_DIR]/svg", "skiabot/skia_svg/svgs" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "push svg to svgs" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/SVG_VERSION", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/SVG_VERSION", "skiabot/skia_tmp_dir/SVG_VERSION" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/SVG_VERSION" + "name": "push [START_DIR]/tmp/SVG_VERSION" }, { "cmd": [ @@ -340,7 +340,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -378,27 +378,27 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_rm", + "[START_DIR]/skia/platform_tools/ios/bin/ios_rm", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "rmdir skiabot/skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_mkdir", + "[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir", "skiabot/skia_dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "mkdir skiabot/skia_dm" }, @@ -407,7 +407,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -429,13 +429,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -474,21 +474,21 @@ }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_push_file", - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt", + "[START_DIR]/skia/platform_tools/ios/bin/ios_push_file", + "[START_DIR]/tmp/uninteresting_hashes.txt", "skiabot/skia_tmp_dir/uninteresting_hashes.txt" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, - "name": "push [SLAVE_BUILD]/tmp/uninteresting_hashes.txt" + "name": "push [START_DIR]/tmp/uninteresting_hashes.txt" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_run_skia", + "[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia", "--dm", "--undefok", "--resourcePath", @@ -907,34 +907,34 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_pull_if_needed", + "[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed", "skiabot/skia_dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "pull skia_dm" }, { "cmd": [ - "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_restart" + "[START_DIR]/skia/platform_tools/ios/bin/ios_restart" ], "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "reboot" }, @@ -946,8 +946,8 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out", - "XCODEBUILD": "[SLAVE_BUILD]/xcodebuild" + "SKIA_OUT": "[START_DIR]/out", + "XCODEBUILD": "[START_DIR]/xcodebuild" }, "name": "wait for reboot" }, diff --git a/infra/bots/recipes/swarm_test.expected/nobuildbot.json b/infra/bots/recipes/swarm_test.expected/nobuildbot.json index 0acebad177..7b0a5a7858 100644 --- a/infra/bots/recipes/swarm_test.expected/nobuildbot.json +++ b/infra/bots/recipes/swarm_test.expected/nobuildbot.json @@ -4,7 +4,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -26,7 +26,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -37,7 +37,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -57,7 +57,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -66,7 +66,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -77,7 +77,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -89,7 +89,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -204,16 +204,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -237,7 +237,7 @@ "swarming_task_id", "123456", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86", @@ -506,7 +506,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json index 50afad0749..d2ec5d7408 100644 --- a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json @@ -4,7 +4,7 @@ "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", + "[START_DIR]/tmp", "511" ], "name": "makedirs tmp_dir", @@ -26,7 +26,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SKP VERSION" @@ -37,7 +37,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" + "[START_DIR]/tmp/SKP_VERSION" ], "name": "write SKP_VERSION" }, @@ -46,7 +46,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], "name": "Get downloaded skimage VERSION" @@ -57,7 +57,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" + "[START_DIR]/tmp/SK_IMAGE_VERSION" ], "name": "write SK_IMAGE_VERSION" }, @@ -66,7 +66,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], "name": "Get downloaded SVG VERSION" @@ -77,7 +77,7 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" + "[START_DIR]/tmp/SVG_VERSION" ], "name": "write SVG_VERSION" }, @@ -89,7 +89,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" }, "name": "rmtree dm", "~followup_annotations": [ @@ -130,13 +130,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" + "[START_DIR]/tmp/uninteresting_hashes.txt" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" + "SKIA_OUT": "[START_DIR]/out" }, "name": "get uninteresting hashes", "~followup_annotations": [ @@ -176,16 +176,16 @@ { "cmd": [ "catchsegv", - "[SLAVE_BUILD]/out/Debug/dm", + "[START_DIR]/out/Debug/dm", "--undefok", "--resourcePath", - "[SLAVE_BUILD]/skia/resources", + "[START_DIR]/skia/resources", "--skps", - "[SLAVE_BUILD]/skp", + "[START_DIR]/skp", "--images", - "[SLAVE_BUILD]/skimage/dm", + "[START_DIR]/skimage/dm", "--colorImages", - "[SLAVE_BUILD]/skimage/colorspace", + "[START_DIR]/skimage/colorspace", "--nameByHash", "--properties", "gitHash", @@ -203,7 +203,7 @@ "patch_storage", "gerrit", "--svgs", - "[SLAVE_BUILD]/svg", + "[START_DIR]/svg", "--key", "arch", "x86", @@ -472,7 +472,7 @@ "_", "gamut" ], - "cwd": "[SLAVE_BUILD]/skia", + "cwd": "[START_DIR]/skia", "name": "dm" }, { |