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

Unified Diff: scripts/slave/recipe_modules/isolate/example.expected/extra.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
Index: scripts/slave/recipe_modules/isolate/example.expected/extra.json
diff --git a/scripts/slave/recipe_modules/isolate/example.expected/extra.json b/scripts/slave/recipe_modules/isolate/example.expected/extra.json
index f2f5cc7bda005f4f8697beb7b05c39c53e41a978..8236f288ae13c65ba49213be4a5127f7431ac559 100644
--- a/scripts/slave/recipe_modules/isolate/example.expected/extra.json
+++ b/scripts/slave/recipe_modules/isolate/example.expected/extra.json
@@ -5,11 +5,10 @@
"-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"
],
- "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -20,7 +19,7 @@
"origin",
"master"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "git fetch (swarming_client)"
},
{
@@ -30,7 +29,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "git checkout (swarming_client)"
},
{
@@ -39,7 +38,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -54,7 +53,7 @@
"-d",
"-x"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "git clean (swarming_client)"
},
{
@@ -63,7 +62,7 @@
"submodule",
"sync"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "submodule sync (swarming_client)"
},
{
@@ -74,14 +73,13 @@
"--init",
"--recursive"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "submodule update (swarming_client)"
},
{
"cmd": [
"cat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"stdout": "/path/to/tmp/json",
"~followup_annotations": [
@@ -98,11 +96,10 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[BUILD]",
+ "[ROOT]/b/build",
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -119,16 +116,15 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/swarming.client",
+ "[CWD]/swarming.client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver-dev.appspot.com",
- "[BUILD]/test1.isolated.gen.json",
- "[BUILD]/test2.isolated.gen.json"
+ "[ROOT]/b/build/test1.isolated.gen.json",
+ "[ROOT]/b/build/test2.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",

Powered by Google App Engine
This is Rietveld 408576698