diff options
author | 2017-12-07 11:19:31 -0500 | |
---|---|---|
committer | 2017-12-07 17:06:59 +0000 | |
commit | 4fd283eb7a3f91dfed949ad8df6c475a693cba04 (patch) | |
tree | 04387937f5dc5382579e15c9fa9ff7f08f1862d1 /infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json | |
parent | b5e2acc413ff60e99ef5ba952b10acf67c78ec87 (diff) |
Use full paths for adb
Add logic to run on Nexus 5xs in Golo.
Bug:788839
Change-Id: I12290d11a0b1b0f012ada216da3e5b2599979c5e
Reviewed-on: https://skia-review.googlesource.com/81861
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json')
-rw-r--r-- | infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index 76000150b1..0d0eb4b752 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json @@ -50,7 +50,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "push", "file.txt", "file.txt" @@ -95,7 +95,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-rf", @@ -113,7 +113,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "mkdir", "-p", @@ -131,7 +131,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "mkdir", "-p", @@ -151,7 +151,7 @@ "cmd": [ "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.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", + "\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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", "[START_DIR]/skia/resources", "/sdcard/revenge_of_the_skiabot/resources" ], @@ -176,7 +176,7 @@ "@@@STEP_LOG_LINE@python.inline@ continue@@@", "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/usr/bin/adb.1.0.35', 'push',@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", "@@@STEP_LOG_END@python.inline@@@" @@ -212,7 +212,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "cat", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -230,7 +230,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-f", @@ -248,7 +248,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-rf", @@ -266,7 +266,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "mkdir", "-p", @@ -286,7 +286,7 @@ "cmd": [ "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.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", + "\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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", "[START_DIR]/skp", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -311,7 +311,7 @@ "@@@STEP_LOG_LINE@python.inline@ continue@@@", "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/usr/bin/adb.1.0.35', 'push',@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", "@@@STEP_LOG_END@python.inline@@@" @@ -319,7 +319,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "push", "[START_DIR]/tmp/SKP_VERSION", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" @@ -364,7 +364,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "cat", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -382,7 +382,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-f", @@ -400,7 +400,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-rf", @@ -418,7 +418,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "mkdir", "-p", @@ -438,7 +438,7 @@ "cmd": [ "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.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", + "\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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", "[START_DIR]/skimage", "/sdcard/revenge_of_the_skiabot/images" ], @@ -463,7 +463,7 @@ "@@@STEP_LOG_LINE@python.inline@ continue@@@", "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/usr/bin/adb.1.0.35', 'push',@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", "@@@STEP_LOG_END@python.inline@@@" @@ -471,7 +471,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "push", "[START_DIR]/tmp/SK_IMAGE_VERSION", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" @@ -516,7 +516,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "cat", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -534,7 +534,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-f", @@ -552,7 +552,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "rm", "-rf", @@ -570,7 +570,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "mkdir", "-p", @@ -590,7 +590,7 @@ "cmd": [ "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.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", + "\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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", "[START_DIR]/svg", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -615,7 +615,7 @@ "@@@STEP_LOG_LINE@python.inline@ continue@@@", "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/usr/bin/adb.1.0.35', 'push',@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", "@@@STEP_LOG_END@python.inline@@@" @@ -623,7 +623,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "push", "[START_DIR]/tmp/SVG_VERSION", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" @@ -643,7 +643,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nmodel = sys.argv[2]\ntarget_percent = float(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nif model == 'Nexus10':\n # Nexus10 doesn't list available frequencies, but it does give a\n # min and a max and seems to round to the nearest 100khz, so a\n # subset of those available are here.\n available_freqs = [200000, 400000, 600000, 800000, 1000000, 1200000,\n 1400000, 1700000]\nelif model == 'Nexus7':\n # Nexus7 claims to support 1300000, but only really allows 1200000\n available_freqs = [51000, 102000, 204000, 340000, 475000, 640000, 760000,\n 860000, 1000000, 1100000, 1200000]\nelse:\n # Most devices give a list of their available frequencies.\n available_freqs = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies'])\n\n # Check for message like '/system/bin/sh: file not found'\n if available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\n else:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\nsubprocess.check_output([ADB, 'shell', 'echo \"userspace\" > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor'])\n# If scaling_max_freq is lower than our attempted setting, it won't take.\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq' % freq])\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq'])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed' % freq])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq']).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "NexusPlayer", "0.6" ], @@ -723,7 +723,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "push", "[START_DIR]/out/Debug/nanobench", "/data/local/tmp/" @@ -754,7 +754,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "push", "[START_DIR]/tmp/nanobench.sh", "/data/local/tmp/" @@ -771,7 +771,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "logcat", "-c" ], @@ -789,7 +789,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -800,9 +800,9 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb.1.0.35', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',@@@", "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", @@ -812,7 +812,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "pull", "/sdcard/revenge_of_the_skiabot/perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android/data" @@ -831,7 +831,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb.1.0.35', '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", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', '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", "[START_DIR]/out/Debug" ], "env": { @@ -850,7 +850,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb.1.0.35', 'logcat', '-d'])@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -866,7 +866,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "shell", "reboot", "-p" @@ -883,7 +883,7 @@ }, { "cmd": [ - "adb.1.0.35", + "/usr/bin/adb.1.0.35", "kill-server" ], "cwd": "[START_DIR]/skia", |