Index: scripts/slave/recipes/mojo.expected/mojo_linux_asan.json |
diff --git a/scripts/slave/recipes/mojo.expected/mojo_linux_asan.json b/scripts/slave/recipes/mojo.expected/mojo_linux_asan.json |
index de540c8ea7eea1693e243015ae6e770c91719040..f9831891d2fcc7e16526effec56055883507c724 100644 |
--- a/scripts/slave/recipes/mojo.expected/mojo_linux_asan.json |
+++ b/scripts/slave/recipes/mojo.expected/mojo_linux_asan.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,6 +25,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -53,6 +54,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -62,14 +64,14 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/mojo/tools/mojob.py", |
+ "[SLAVE_BUILD]/src/mojo/tools/mojob.py", |
"gn", |
"--release", |
"--asan" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"env": { |
- "GOMA_DIR": "[ROOT]/b/build/goma" |
+ "GOMA_DIR": "[BUILD]/goma" |
}, |
"name": "mojob gn" |
}, |
@@ -77,13 +79,14 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/mojo/tools/mojob.py", |
+ "[SLAVE_BUILD]/src/mojo/tools/mojob.py", |
"build", |
"--release", |
"--asan" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "GOMA_DIR": "[ROOT]/b/build/goma" |
+ "GOMA_DIR": "[BUILD]/goma" |
}, |
"name": "mojob build" |
}, |
@@ -91,10 +94,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/mojo/tools/get_test_list.py", |
+ "[SLAVE_BUILD]/src/mojo/tools/get_test_list.py", |
"{\"build_number\": 571, \"builder_name\": \"Mojo Linux ASan\", \"dcheck_always_on\": false, \"is_debug\": false, \"master_name\": \"chromium.testing.master\", \"sanitizer\": \"asan\", \"target_os\": \"linux\", \"test_results_server\": \"test-results.appspot.com\", \"test_types\": [\"default\"]}", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "get_test_list", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[@@@", |
@@ -112,7 +116,7 @@ |
"cmd": [ |
"world" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Hello" |
}, |
{ |