AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reland [recipes] Isolate build outputs with no subdirs

Browse Source 
Bug: skia:6473
Change-Id: I730cb860abc72473aaa9af98527fd220b9a55120
Reviewed-on: https://skia-review.googlesource.com/131389
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2018-06-01 10:08:53 -04:00 committed by Skia Commit-Bot
parent ba2f82986f
commit 322a859bda
144 changed files with 204 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/binary_size/api.py
View File

@ -10,7 +10,7 @@ from recipe_engine import config_types
class BinarySizeApi(recipe_api.RecipeApi):
def run_analysis(self, skia_dir, dest_file):
cmd = ['python', self.resource('run_binary_size_analysis.py'),
'--library', self.m.vars.skia_out.join('libskia.so'),
'--library', self.m.vars.build_dir.join('libskia.so'),
'--githash', self.m.properties['revision'],
'--dest', dest_file]
if self.m.vars.is_trybot:

2
infra/bots/recipe_modules/binary_size/examples/full.expected/binary_size.json
View File

@ -4,7 +4,7 @@
"python",
"RECIPE_MODULE[skia::binary_size]/resources/run_binary_size_analysis.py",
"--library",
"[START_DIR]/build/out/Release/libskia.so",
"[START_DIR]/build/libskia.so",
"--githash",
"abc123",
"--dest",

2
infra/bots/recipe_modules/build/default.py
View File

@ -279,4 +279,4 @@ def copy_extra_build_products(api, src, dst):
if 'SwiftShader' in api.vars.extra_tokens:
util.copy_whitelisted_build_products(api,
src.join('swiftshader_out'),
api.vars.swarming_out_dir.join('out', 'swiftshader_out'))
api.vars.swarming_out_dir.join('swiftshader_out'))

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
View File

@ -147,7 +147,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out",
"[START_DIR]/[SWARM_OUT_DIR]/out/swiftshader_out"
"[START_DIR]/[SWARM_OUT_DIR]/swiftshader_out"
],
"infra_step": true,
"name": "copy build products (2)",

4
infra/bots/recipe_modules/flavor/android.py
View File

@ -446,7 +446,7 @@ wait_for_device()
line = line.replace(addr, addr + ' ' + sym.strip())
print line
""" % self.ADB_BINARY,
args=[self.m.vars.skia_out],
args=[self.host_dirs.bin_dir],
infra_step=True,
timeout=300,
abort_on_failure=False)
@ -472,7 +472,7 @@ wait_for_device()
self._scale_for_nanobench()
else:
self._scale_for_dm()
app = self.m.vars.skia_out.join(cmd[0])
app = self.host_dirs.bin_dir.join(cmd[0])
self._adb('push %s' % cmd[0],
'push', app, self.device_dirs.bin_dir)

2
infra/bots/recipe_modules/flavor/chromebook.py
View File

@ -122,7 +122,7 @@ class ChromebookFlavor(default.DefaultFlavor):
if name == 'nanobench':
self.create_clean_host_dir(self.host_dirs.perf_data_dir)
app = self.m.vars.skia_out.join(cmd[0])
app = self.host_dirs.bin_dir.join(cmd[0])
cmd[0] = '%s/%s' % (self.device_dirs.bin_dir, cmd[0])
self.copy_file_to_device(app, cmd[0])

4
infra/bots/recipe_modules/flavor/chromecast.py
View File

@ -125,7 +125,7 @@ class ChromecastFlavor(android.AndroidFlavor):
line = line.replace(addr, addr + ' ' + sym.strip())
print line
""",
args=[self.m.vars.skia_out],
args=[self.host_dirs.bin_dir],
infra_step=True,
abort_on_failure=False)
@ -145,7 +145,7 @@ class ChromecastFlavor(android.AndroidFlavor):
return self.m.run(self.m.step, title, cmd=ssh_cmd, **kwargs)
def step(self, name, cmd, **kwargs):
app = self.m.vars.skia_out.join(cmd[0])
app = self.host_dirs.bin_dir.join(cmd[0])
self._adb('push %s' % cmd[0],
'push', app, self.device_dirs.bin_dir)

5
infra/bots/recipe_modules/flavor/default.py
View File

@ -78,7 +78,7 @@ class DefaultFlavor(object):
self.m = module.m
self._chrome_path = None
self.device_dirs = DeviceDirs(
bin_dir=self.m.vars.build_dir.join('out', self.m.vars.configuration),
bin_dir=self.m.vars.build_dir,
dm_dir=self.m.path.join(self.m.vars.swarming_out_dir, 'dm'),
perf_data_dir=self.m.path.join(
self.m.vars.swarming_out_dir,
@ -178,8 +178,7 @@ class DefaultFlavor(object):
ld_library_path.append(slave_dir.join('linux_vulkan_sdk', 'lib'))
if 'SwiftShader' in extra_tokens:
ld_library_path.append(
self.m.vars.build_dir.join('out', 'swiftshader_out'))
ld_library_path.append(self.host_dirs.bin_dir.join('swiftshader_out'))
if 'MSAN' in extra_tokens:
# Find the MSAN-built libc++.

4
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
View File

@ -566,7 +566,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -669,7 +669,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
View File

@ -944,7 +944,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -1047,7 +1047,7 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/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",
"[START_DIR]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
View File

@ -671,11 +671,11 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"foo@127.0.0.1:/home/chronos/user/bin/nanobench"
],
"infra_step": true,
"name": "scp [START_DIR]/build/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench",
"name": "scp [START_DIR]/build/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
View File

@ -610,7 +610,7 @@
"cmd": [
"adb",
"push",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"/cache/skia/bin"
],
"cwd": "[START_DIR]/skia",
@ -701,7 +701,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",
"[START_DIR]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
View File

@ -145,7 +145,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"--some-flag"
],
"cwd": "[START_DIR]/skia",

2
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
View File

@ -145,7 +145,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"--some-flag"
],
"cwd": "[START_DIR]/skia",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
View File

@ -608,7 +608,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -711,7 +711,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
View File

@ -566,7 +566,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -669,7 +669,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
View File

@ -850,7 +850,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -953,7 +953,7 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/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",
"[START_DIR]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
View File

@ -937,7 +937,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -1040,7 +1040,7 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/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",
"[START_DIR]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
View File

@ -671,11 +671,11 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"foo@127.0.0.1:/home/chronos/user/bin/dm"
],
"infra_step": true,
"name": "scp [START_DIR]/build/out/Release/dm foo@127.0.0.1:/home/chronos/user/bin/dm",
"name": "scp [START_DIR]/build/dm foo@127.0.0.1:/home/chronos/user/bin/dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

2
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json
View File

@ -146,7 +146,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",

2
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
View File

@ -145,7 +145,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader.json
View File

@ -146,13 +146,13 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/build/out/swiftshader_out",
"LD_LIBRARY_PATH": "[START_DIR]/build/swiftshader_out",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "symbolized dm"

2
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
View File

@ -146,7 +146,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"cwd": "[START_DIR]/skia",

2
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN.json
View File

@ -141,7 +141,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"env": {

2
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
View File

@ -148,7 +148,7 @@
"--error-exitcode=1",
"--num-callers=40",
"--suppressions=[START_DIR]/skia/tools/valgrind.supp",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"env": {

2
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
View File

@ -163,7 +163,7 @@
"1",
"-x",
"[START_DIR]/[SWARM_OUT_DIR]/dumps",
"[START_DIR]/build/out/Release_x64/dm",
"[START_DIR]/build/dm",
"--some-flag"
],
"env": {

2
infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
View File

@ -837,7 +837,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
View File

@ -837,7 +837,7 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/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",
"[START_DIR]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
View File

@ -874,7 +874,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -977,7 +977,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
View File

@ -798,7 +798,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -901,7 +901,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
View File

@ -849,7 +849,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -952,7 +952,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
View File

@ -849,7 +849,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -952,7 +952,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
View File

@ -205,7 +205,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

6
infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
View File

@ -79,7 +79,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/dm.app"
"[START_DIR]/build/dm.app"
],
"env": {
"CHROME_HEADLESS": "1",
@ -109,7 +109,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/dm.app"
"[START_DIR]/build/dm.app"
],
"env": {
"CHROME_HEADLESS": "1",
@ -122,7 +122,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/nanobench.app"
"[START_DIR]/build/nanobench.app"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
View File

@ -79,7 +79,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/dm.app"
"[START_DIR]/build/dm.app"
],
"env": {
"CHROME_HEADLESS": "1",
@ -109,7 +109,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/dm.app"
"[START_DIR]/build/dm.app"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/flavor/ios.py
View File

@ -31,7 +31,7 @@ class iOSFlavor(default.DefaultFlavor):
# Install the app.
for app_name in ['dm', 'nanobench']:
app_package = self.m.vars.skia_out.join('%s.app' % app_name)
app_package = self.host_dirs.bin_dir.join('%s.app' % app_name)
def uninstall_app(attempt):
# If app ID changes, upgrade will fail, so try uninstalling.

2
infra/bots/recipe_modules/flavor/valgrind.py
View File

@ -23,7 +23,7 @@ class ValgrindFlavor(default.DefaultFlavor):
new_cmd = [self._valgrind, '--gen-suppressions=all', '--leak-check=full',
'--track-origins=yes', '--error-exitcode=1', '--num-callers=40',
'--suppressions=%s' % self._suppressions_file]
path_to_app = self.m.vars.skia_out.join(cmd[0])
path_to_app = self.host_dirs.bin_dir.join(cmd[0])
new_cmd.append(path_to_app)
new_cmd.extend(cmd[1:])
with self.m.env({'VALGRIND_LIB': self._lib_dir}):

2
infra/bots/recipe_modules/vars/api.py
View File

@ -50,8 +50,6 @@ class SkiaVarsApi(recipe_api.RecipeApi):
if ('Win' in self.builder_cfg.get('os', '') and arch == 'x86_64'):
self.configuration += '_x64'
self.skia_out = self.build_dir.join('out', self.configuration)
self.extra_tokens = []
if len(self.builder_cfg.get('extra_config', '')) > 0:
if self.builder_cfg['extra_config'].startswith('SK'):

4
infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-e",
@ -210,7 +210,7 @@
"python",
"[START_DIR]/cache/work/skia/infra/bots/upload_md.py",
"--bookmaker_binary",
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"--fiddlecli_output",
"[START_DIR]/fiddleout.json"
],

2
infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-e",

2
infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-e",

2
infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-e",

4
infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-e",
@ -176,7 +176,7 @@
"python",
"[START_DIR]/cache/work/skia/infra/bots/upload_md.py",
"--bookmaker_binary",
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"--fiddlecli_output",
"[START_DIR]/fiddleout.json"
],

2
infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-x"

2
infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json
View File

@ -137,7 +137,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/bookmaker",
"[START_DIR]/build/bookmaker",
"-a",
"docs/status.json",
"-x"

2
infra/bots/recipes/bookmaker.py
View File

@ -46,7 +46,7 @@ def RunSteps(api):
skia_dir = checkout_root.join('skia')
with api.context(cwd=skia_dir, env=api.infra.go_env):
bookmaker_binary = api.vars.skia_out.join('bookmaker')
bookmaker_binary = api.vars.build_dir.join('bookmaker')
buildername = api.vars.builder_name
if 'PerCommit' in buildername:

4
infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All.json
View File

@ -92,8 +92,8 @@
"[START_DIR]/[SWARM_OUT_DIR]",
"modified",
"master",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/ParentRevision/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"[START_DIR]/build/ParentRevision/nanobench",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp --mpd false",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp --mpd false",
"2",

4
infra/bots/recipes/calmbench.expected/Calmbench-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All.json
View File

@ -92,8 +92,8 @@
"[START_DIR]/[SWARM_OUT_DIR]",
"modified",
"master",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/ParentRevision/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"[START_DIR]/build/ParentRevision/nanobench",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp",
"--svgs [START_DIR]/svg --skps [START_DIR]/skp",
"2",

5
infra/bots/recipes/calmbench.py
View File

@ -44,9 +44,8 @@ def RunSteps(api):
skia_dir.join('tools', 'calmbench', 'ab.py'),
api.vars.swarming_out_dir,
'modified', 'master',
api.vars.build_dir.join("out", api.vars.configuration, 'nanobench'),
api.vars.build_dir.join("ParentRevision", "out",
api.vars.configuration, 'nanobench'),
api.vars.build_dir.join('nanobench'),
api.vars.build_dir.join('ParentRevision', 'nanobench'),
extra_arg, extra_arg,
2, # reps
"false", # skipbase

4
infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
View File

@ -218,7 +218,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP/devrel",
"[START_DIR]/[SWARM_OUT_DIR]/out/devrel"
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy build products",
@ -259,7 +259,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/cache/work/skia/infra/cts/whitelist_devices.json",
"[START_DIR]/[SWARM_OUT_DIR]/out/devrel"
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy whitelist"

2
infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json
View File

@ -142,7 +142,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS/Release",
"[START_DIR]/[SWARM_OUT_DIR]/out/Release"
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy build products",

2
infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json
View File

@ -171,7 +171,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-ParentRevision/Release",
"[START_DIR]/[SWARM_OUT_DIR]/ParentRevision/out/Release"
"[START_DIR]/[SWARM_OUT_DIR]/ParentRevision"
],
"infra_step": true,
"name": "copy build products",

2
infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
View File

@ -186,7 +186,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/cache/work/flutter/src/out/android_release",
"[START_DIR]/[SWARM_OUT_DIR]/out/Release"
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy build products",

2
infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
View File

@ -194,7 +194,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
"[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy build products",

2
infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json
View File

@ -171,7 +171,7 @@
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug/Debug",
"[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy build products",

6
infra/bots/recipes/compile.py
View File

@ -69,16 +69,14 @@ def RunSteps(api):
api.build(checkout_root=checkout_root, out_dir=out_dir)
# TODO(borenet): Move this out of the try/finally.
dst = api.vars.swarming_out_dir.join('out', api.vars.configuration)
dst = api.vars.swarming_out_dir
if 'ParentRevision' in api.vars.builder_name:
dst = api.vars.swarming_out_dir.join(
'ParentRevision', 'out', api.vars.configuration)
dst = api.vars.swarming_out_dir.join('ParentRevision')
api.build.copy_build_products(out_dir=out_dir, dst=dst)
if 'SKQP' in api.vars.extra_tokens:
wlist = checkout_root.join(
'skia', 'infra','cts', 'whitelist_devices.json')
api.file.copy('copy whitelist', wlist, dst)
finally:
if 'Win' in api.vars.builder_cfg.get('os', ''):
api.python.inline(

2
infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
View File

@ -132,7 +132,7 @@
"python",
"RECIPE_MODULE[skia::binary_size]/resources/run_binary_size_analysis.py",
"--library",
"[START_DIR]/build/out/Release/libskia.so",
"[START_DIR]/build/libskia.so",
"--githash",
"abc123",
"--dest",

2
infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
View File

@ -140,7 +140,7 @@
"python",
"RECIPE_MODULE[skia::binary_size]/resources/run_binary_size_analysis.py",
"--library",
"[START_DIR]/build/out/Release/libskia.so",
"[START_DIR]/build/libskia.so",
"--githash",
"abc123",
"--dest",

4
infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json
View File

@ -709,7 +709,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -804,7 +804,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
View File

@ -797,7 +797,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -923,7 +923,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
View File

@ -781,7 +781,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -907,7 +907,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-ASUSChromebookFlipC100-GPU-MaliT764-arm-Release-All.json
View File

@ -674,7 +674,7 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"foo@127.0.0.1:/home/chronos/user/bin/nanobench"
],
"env": {
@ -682,7 +682,7 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "scp [START_DIR]/build/out/Release/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench",
"name": "scp [START_DIR]/build/nanobench foo@127.0.0.1:/home/chronos/user/bin/nanobench",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

4
infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug-All.json
View File

@ -292,7 +292,7 @@
"cmd": [
"adb",
"push",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"/cache/skia/bin"
],
"cwd": "[START_DIR]/skia",
@ -386,7 +386,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",
"[START_DIR]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
View File

@ -324,7 +324,7 @@
"cmd": [
"adb",
"push",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"/cache/skia/bin"
],
"cwd": "[START_DIR]/skia",
@ -470,7 +470,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",
"[START_DIR]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
View File

@ -132,7 +132,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json
View File

@ -133,7 +133,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
"[START_DIR]/build/out/Debug/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json
View File

@ -161,7 +161,7 @@
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"catchsegv",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-CommandBuffer.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
View File

@ -135,7 +135,7 @@
"--error-exitcode=1",
"--num-callers=40",
"--suppressions=[START_DIR]/skia/tools/valgrind.supp",
"[START_DIR]/build/out/Release/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]\\build\\out\\Release_x64\\nanobench",
"[START_DIR]\\build\\nanobench",
"-i",
"[START_DIR]\\skia\\resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]\\build\\out\\Release_x64\\nanobench",
"[START_DIR]\\build\\nanobench",
"-i",
"[START_DIR]\\skia\\resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]\\build\\out\\Release_x64\\nanobench",
"[START_DIR]\\build\\nanobench",
"-i",
"[START_DIR]\\skia\\resources",
"--skps",

2
infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]\\build\\out\\Release_x64\\nanobench",
"[START_DIR]\\build\\nanobench",
"-i",
"[START_DIR]\\skia\\resources",
"--skps",

4
infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
View File

@ -31,7 +31,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/dm.app"
"[START_DIR]/build/dm.app"
],
"env": {
"CHROME_HEADLESS": "1",
@ -46,7 +46,7 @@
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/out/Release/nanobench.app"
"[START_DIR]/build/nanobench.app"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipes/perf.expected/trybot.json
View File

@ -156,7 +156,7 @@
},
{
"cmd": [
"[START_DIR]/build/out/Release_x64/nanobench",
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",

4
infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
View File

@ -195,7 +195,7 @@
"cmd": [
"adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/skpbench",
"[START_DIR]/build/skpbench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -304,7 +304,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
View File

@ -195,7 +195,7 @@
"cmd": [
"adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/skpbench",
"[START_DIR]/build/skpbench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -300,7 +300,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json
View File

@ -195,7 +195,7 @@
"cmd": [
"adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/skpbench",
"[START_DIR]/build/skpbench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -300,7 +300,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
View File

@ -62,7 +62,7 @@
"python",
"-u",
"[START_DIR]/skia/tools/skpbench/skpbench.py",
"[START_DIR]/build/out/Release_x64/skpbench",
"[START_DIR]/build/skpbench",
"--resultsfile",
"[START_DIR]/[SWARM_OUT_DIR]/table",
"--config",

2
infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
View File

@ -62,7 +62,7 @@
"python",
"-u",
"[START_DIR]/skia/tools/skpbench/skpbench.py",
"[START_DIR]/build/out/Release_x64/skpbench",
"[START_DIR]/build/skpbench",
"--resultsfile",
"[START_DIR]/[SWARM_OUT_DIR]/table",
"--config",

2
infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
View File

@ -62,7 +62,7 @@
"python",
"-u",
"[START_DIR]/skia/tools/skpbench/skpbench.py",
"[START_DIR]/build/out/Release_x64/skpbench",
"[START_DIR]/build/skpbench",
"--resultsfile",
"[START_DIR]/[SWARM_OUT_DIR]/table",
"--config",

4
infra/bots/recipes/skpbench.expected/trybot.json
View File

@ -195,7 +195,7 @@
"cmd": [
"adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/skpbench",
"[START_DIR]/build/skpbench",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -306,7 +306,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipes/skpbench.py
View File

@ -43,7 +43,7 @@ def skpbench_steps(api):
'makedirs perf_dir', api.flavor.host_dirs.perf_data_dir)
if 'Android' in api.vars.builder_name:
app = api.vars.skia_out.join('skpbench')
app = api.vars.build_dir.join('skpbench')
_adb(api, 'push skpbench', 'push', app, api.flavor.device_dirs.bin_dir)
skpbench_dir = api.vars.slave_dir.join('skia', 'tools', 'skpbench')

2
infra/bots/recipes/skqp_test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-universal-devrel-All-Android_SKQP.json
View File

@ -17,7 +17,7 @@
{
"cmd": [
"catchsegv",
"[START_DIR]/build/out/devrel/run_testlab",
"[START_DIR]/build/run_testlab",
"--logtostderr",
"--devices",
"[START_DIR]/whitelist_devices.json",

4
infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
View File

@ -698,7 +698,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -809,7 +809,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json
View File

@ -656,7 +656,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -767,7 +767,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json
View File

@ -656,7 +656,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -767,7 +767,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json
View File

@ -656,7 +656,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -767,7 +767,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json
View File

@ -698,7 +698,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -809,7 +809,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json
View File

@ -902,7 +902,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -997,7 +997,7 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/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",
"[START_DIR]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
View File

@ -940,7 +940,7 @@
"cmd": [
"/opt/infra-android/tools/adb",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -1051,7 +1051,7 @@
"python",
"-u",
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/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",
"[START_DIR]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
View File

@ -698,7 +698,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -809,7 +809,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
View File

@ -740,7 +740,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -851,7 +851,7 @@
"python",
"-u",
"\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]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json
View File

@ -840,7 +840,7 @@
"cmd": [
"/usr/bin/adb.1.0.35",
"push",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
@ -951,7 +951,7 @@
"python",
"-u",
"\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]/build/out/Debug"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-ChromeOS-Clang-AcerChromebookR13Convertible-GPU-PowerVRGX6250-arm-Debug-All.json
View File

@ -769,7 +769,7 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nprint subprocess.check_output(['scp', host, device])\n",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"foo@127.0.0.1:/home/chronos/user/bin/dm"
],
"env": {
@ -777,7 +777,7 @@
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "scp [START_DIR]/build/out/Debug/dm foo@127.0.0.1:/home/chronos/user/bin/dm",
"name": "scp [START_DIR]/build/dm foo@127.0.0.1:/home/chronos/user/bin/dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

4
infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release-All.json
View File

@ -414,7 +414,7 @@
"cmd": [
"adb",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/cache/skia/bin"
],
"cwd": "[START_DIR]/skia",
@ -571,7 +571,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",
"[START_DIR]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipes/test.expected/Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All.json
View File

@ -414,7 +414,7 @@
"cmd": [
"adb",
"push",
"[START_DIR]/build/out/Release/dm",
"[START_DIR]/build/dm",
"/cache/skia/bin"
],
"cwd": "[START_DIR]/skia",
@ -678,7 +678,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",
"[START_DIR]/build/out/Release"
"[START_DIR]/build"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
View File

@ -132,7 +132,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"--resourcePath",
"[START_DIR]/skia/resources",
"--skps",

2
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
View File

@ -132,7 +132,7 @@
"-u",
"RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py",
"[START_DIR]",
"[START_DIR]/build/out/Debug/dm",
"[START_DIR]/build/dm",
"--resourcePath",
"[START_DIR]/skia/resources",
"--skps",

Some files were not shown because too many files have changed in this diff Show More