Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.json ('k') | scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
index bdcba6eb4ba8c981155d3dd1400aac0bdd8c3e24..b76aa865798260af0a465143b8716b52619cd427 100644
--- a/scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
+++ b/scripts/slave/recipes/skia/skia.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
@@ -7,7 +7,7 @@
"origin",
"https://skia.googlesource.com/skia.git"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git remote set-url"
},
{
@@ -15,7 +15,7 @@
"git",
"fetch"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git fetch"
},
{
@@ -25,7 +25,7 @@
"--hard",
"abc123"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git reset"
},
{
@@ -35,7 +35,7 @@
"-d",
"-f"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git clean"
},
{
@@ -45,8 +45,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']"
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -69,6 +70,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -95,6 +97,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -104,11 +107,11 @@
"cmd": [
"python",
"-u",
- "[CWD]/skia/tools/buildbot_spec.py",
+ "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
"Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -153,14 +156,14 @@
"make",
"dm"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_PATH": "[HOME]/src",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "build dm"
},
@@ -168,21 +171,22 @@
"cmd": [
"python",
"-u",
- "[CWD]/skia/tools/build_command_buffer.py",
+ "[SLAVE_BUILD]/skia/tools/build_command_buffer.py",
"--chrome-dir",
- "[CWD]",
+ "[SLAVE_BUILD]",
"--output-dir",
- "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer/Debug",
+ "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer/Debug",
"--chrome-build-type",
"Debug",
"--no-sync"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "build command_buffer"
},
@@ -191,14 +195,14 @@
"make",
"nanobench"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_PATH": "[HOME]/src",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "build nanobench"
},
@@ -207,9 +211,10 @@
"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",
- "[CWD]/tmp",
+ "[SLAVE_BUILD]/tmp",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -229,9 +234,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/tmp/SKP_VERSION",
+ "[SLAVE_BUILD]/tmp/SKP_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION"
},
{
@@ -239,9 +245,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/skia/SKP_VERSION",
+ "[SLAVE_BUILD]/skia/SKP_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -249,9 +256,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/tmp/SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -259,9 +267,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/skia/SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -269,8 +278,9 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[CWD]/dm"
+ "[SLAVE_BUILD]/dm"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -288,9 +298,10 @@
"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",
- "[CWD]/dm",
+ "[SLAVE_BUILD]/dm",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -310,15 +321,15 @@
"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",
- "[CWD]/tmp/uninteresting_hashes.txt"
+ "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -358,14 +369,14 @@
{
"cmd": [
"catchsegv",
- "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer/Debug/dm",
+ "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer/Debug/dm",
"--undefok",
"--resourcePath",
- "[CWD]/skia/resources",
+ "[SLAVE_BUILD]/skia/resources",
"--skps",
- "[CWD]/playback/skps",
+ "[SLAVE_BUILD]/playback/skps",
"--images",
- "[CWD]/images/dm",
+ "[SLAVE_BUILD]/images/dm",
"--nameByHash",
"--properties",
"gitHash",
@@ -394,18 +405,19 @@
"os",
"Mac",
"--uninterestingHashesFile",
- "[CWD]/tmp/uninteresting_hashes.txt",
+ "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
"--writePath",
- "[CWD]/dm",
+ "[SLAVE_BUILD]/dm",
"--nocpu",
"--dummy-flags"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "dm"
},
@@ -414,14 +426,14 @@
"python",
"-u",
"RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
- "[CWD]/dm",
+ "[SLAVE_BUILD]/dm",
"164710",
"Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
"5",
"",
- "[CWD]/skia/common/py/utils"
+ "[SLAVE_BUILD]/skia/common/py/utils"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"env": {
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto",
@@ -429,30 +441,31 @@
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "Upload DM Results"
},
{
"cmd": [
"catchsegv",
- "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer/Debug/nanobench",
+ "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer/Debug/nanobench",
"--undefok",
"-i",
- "[CWD]/skia/resources",
+ "[SLAVE_BUILD]/skia/resources",
"--skps",
- "[CWD]/playback/skps",
+ "[SLAVE_BUILD]/playback/skps",
"--images",
- "[CWD]/images/dm",
+ "[SLAVE_BUILD]/images/dm",
"--nocpu",
"--dummy-flags"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=0",
- "SKIA_OUT": "[CWD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
},
"name": "nanobench"
},
« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug.json ('k') | scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698