Index: scripts/slave/recipes/mojo.expected/mojo_win_dbg.json |
diff --git a/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json b/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json |
index aaa6cdc908c0eff3f6b64a97cef1c43ecce199cc..418349345b18dcf9c3ce7557197a0738ad1793ac 100644 |
--- a/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json |
+++ b/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,7 +25,6 @@ |
"--force", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -54,7 +53,6 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -64,33 +62,31 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/mojo/tools/mojob.py", |
+ "[CWD]/src/mojo/tools/mojob.py", |
"gn", |
"--debug" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "mojob gn" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/mojo/tools/mojob.py", |
+ "[CWD]/src/mojo/tools/mojob.py", |
"build", |
"--debug" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "mojob build" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/mojo/tools/get_test_list.py", |
+ "[CWD]/src/mojo/tools/get_test_list.py", |
"{\"build_number\": 571, \"builder_name\": \"Mojo Win (dbg)\", \"dcheck_always_on\": false, \"is_debug\": true, \"master_name\": \"chromium.testing.master\", \"target_os\": \"windows\", \"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@[@@@", |
@@ -108,7 +104,7 @@ |
"cmd": [ |
"world" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[CWD]/src", |
"name": "Hello" |
}, |
{ |