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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/skia.expected/Build-Win-MSVC-x86-Debug-VS2015.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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/Build-Ubuntu-GCC-x86_64-Release-CMake.json ('k') | scripts/slave/recipes/skia/skia.expected/Housekeeper-PerCommit.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/Build-Win-MSVC-x86-Debug-VS2015.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Build-Win-MSVC-x86-Debug-VS2015.json b/scripts/slave/recipes/skia/skia.expected/Build-Win-MSVC-x86-Debug-VS2015.json
index 1617bbf1f10cfb9ed8d4d33b11927dd46db25a16..bcdc65c8090977fb6c89f775f21e4508b602eabb 100644
--- a/scripts/slave/recipes/skia/skia.expected/Build-Win-MSVC-x86-Debug-VS2015.json
+++ b/scripts/slave/recipes/skia/skia.expected/Build-Win-MSVC-x86-Debug-VS2015.json
@@ -7,7 +7,7 @@
"origin",
"https://skia.googlesource.com/skia.git"
],
- "cwd": "[SLAVE_BUILD]\\skia",
+ "cwd": "[CWD]\\skia",
"name": "git remote set-url"
},
{
@@ -15,7 +15,7 @@
"git.bat",
"fetch"
],
- "cwd": "[SLAVE_BUILD]\\skia",
+ "cwd": "[CWD]\\skia",
"name": "git fetch"
},
{
@@ -25,7 +25,7 @@
"--hard",
"abc123"
],
- "cwd": "[SLAVE_BUILD]\\skia",
+ "cwd": "[CWD]\\skia",
"name": "git reset"
},
{
@@ -35,7 +35,7 @@
"-d",
"-f"
],
- "cwd": "[SLAVE_BUILD]\\skia",
+ "cwd": "[CWD]\\skia",
"name": "git clean"
},
{
@@ -45,9 +45,8 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"config",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+ "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -68,7 +67,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -89,11 +87,11 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py",
+ "[CWD]\\skia\\tools\\buildbot_spec.py",
"/path/to/tmp/json",
"Build-Win-MSVC-x86-Debug-VS2015"
],
- "cwd": "[SLAVE_BUILD]\\skia",
+ "cwd": "[CWD]\\skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -132,10 +130,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\skia\\infra\\bots\\win_toolchain_hash.json",
+ "[CWD]\\skia\\infra\\bots\\win_toolchain_hash.json",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Read win_toolchain_hash.json"
},
{
@@ -143,10 +140,9 @@
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[SLAVE_BUILD]\\tmp",
+ "[CWD]\\tmp",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -166,10 +162,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\tmp\\WIN_TOOLCHAIN_HASH",
+ "[CWD]\\tmp\\WIN_TOOLCHAIN_HASH",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded WIN_TOOLCHAIN_HASH",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -181,9 +176,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]\\win"
+ "[CWD]\\win"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree win",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -209,13 +203,12 @@
"-u",
"RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
"--path",
- "[SLAVE_BUILD]\\swarming.client",
+ "[CWD]\\swarming.client",
"--url",
"https://chromium.googlesource.com/external/swarming.client.git",
"--git_cmd_path",
"RECIPE_PACKAGE_REPO[depot_tools]\\git.bat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -226,7 +219,7 @@
"origin",
"master"
],
- "cwd": "[SLAVE_BUILD]\\swarming.client",
+ "cwd": "[CWD]\\swarming.client",
"name": "git fetch (swarming_client)"
},
{
@@ -236,7 +229,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[SLAVE_BUILD]\\swarming.client",
+ "cwd": "[CWD]\\swarming.client",
"name": "git checkout (swarming_client)"
},
{
@@ -245,7 +238,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[SLAVE_BUILD]\\swarming.client",
+ "cwd": "[CWD]\\swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -260,7 +253,7 @@
"-d",
"-x"
],
- "cwd": "[SLAVE_BUILD]\\swarming.client",
+ "cwd": "[CWD]\\swarming.client",
"name": "git clean (swarming_client)"
},
{
@@ -269,7 +262,7 @@
"submodule",
"sync"
],
- "cwd": "[SLAVE_BUILD]\\swarming.client",
+ "cwd": "[CWD]\\swarming.client",
"name": "submodule sync (swarming_client)"
},
{
@@ -280,17 +273,16 @@
"--init",
"--recursive"
],
- "cwd": "[SLAVE_BUILD]\\swarming.client",
+ "cwd": "[CWD]\\swarming.client",
"name": "submodule update (swarming_client)"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\swarming.client\\swarming.py",
+ "[CWD]\\swarming.client\\swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -301,31 +293,29 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\swarming.client\\isolateserver.py",
+ "[CWD]\\swarming.client\\isolateserver.py",
"download",
"-I",
"https://isolateserver.appspot.com",
"-s",
"38380d77eec9164e5818ae45e2915a6f22d60e85",
"-t",
- "[SLAVE_BUILD]\\win",
+ "[CWD]\\win",
"--cache",
"[HOME]\\.isolate_cache"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Download Win Toolchain"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
+ "[CWD]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
"--win_toolchain_json",
- "[SLAVE_BUILD]\\win\\src\\build\\win_toolchain.json",
+ "[CWD]\\win\\src\\build\\win_toolchain.json",
"--depot_tools_parent_dir",
- "[SLAVE_BUILD]\\win"
+ "[CWD]\\win"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Bootstrap Win Toolchain"
},
{
@@ -334,9 +324,8 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"38380d77eec9164e5818ae45e2915a6f22d60e85",
- "[SLAVE_BUILD]\\tmp\\WIN_TOOLCHAIN_HASH"
+ "[CWD]\\tmp\\WIN_TOOLCHAIN_HASH"
],
- "cwd": "[SLAVE_BUILD]",
"name": "write WIN_TOOLCHAIN_HASH"
},
{
@@ -345,14 +334,14 @@
"make.py",
"most"
],
- "cwd": "[SLAVE_BUILD]\\skia",
+ "cwd": "[CWD]\\skia",
"env": {
"BUILDTYPE": "Debug",
- "CHROME_PATH": "[SLAVE_BUILD]\\win\\src",
+ "CHROME_PATH": "[CWD]\\win\\src",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
"GYP_MSVS_VERSION": "2015",
- "PATH": "[SLAVE_BUILD]\\win\\depot_tools;%(PATH)s",
- "SKIA_OUT": "[SLAVE_BUILD]\\skia\\out\\Build-Win-MSVC-x86-Debug-VS2015"
+ "PATH": "[CWD]\\win\\depot_tools;%(PATH)s",
+ "SKIA_OUT": "[CWD]\\skia\\out\\Build-Win-MSVC-x86-Debug-VS2015"
},
"name": "build most"
},
« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json ('k') | scripts/slave/recipes/skia/skia.expected/Housekeeper-PerCommit.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698