| Index: scripts/slave/recipes/mojo.expected/mojo_linux_perf.json
|
| diff --git a/scripts/slave/recipes/mojo.expected/mojo_linux_perf.json b/scripts/slave/recipes/mojo.expected/mojo_linux_perf.json
|
| index 1207a58ba44f1755219dc89c465ea892539b1c2e..3010b5fd503cdc82550c2ee0f9fb603f838f2f6f 100644
|
| --- a/scripts/slave/recipes/mojo.expected/mojo_linux_perf.json
|
| +++ b/scripts/slave/recipes/mojo.expected/mojo_linux_perf.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,13 +64,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/mojo/tools/mojob.py",
|
| + "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
|
| "gn",
|
| "--release"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "env": {
|
| - "GOMA_DIR": "[ROOT]/b/build/goma"
|
| + "GOMA_DIR": "[BUILD]/goma"
|
| },
|
| "name": "mojob gn"
|
| },
|
| @@ -76,12 +78,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/mojo/tools/mojob.py",
|
| + "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
|
| "build",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GOMA_DIR": "[ROOT]/b/build/goma"
|
| + "GOMA_DIR": "[BUILD]/goma"
|
| },
|
| "name": "mojob build"
|
| },
|
| @@ -89,10 +92,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 Perf\", \"dcheck_always_on\": false, \"is_debug\": false, \"master_name\": \"chromium.testing.master\", \"target_os\": \"linux\", \"test_results_server\": \"test-results.appspot.com\", \"test_types\": [\"perf\"]}",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "get_test_list",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -110,7 +114,7 @@
|
| "cmd": [
|
| "world"
|
| ],
|
| - "cwd": "[CWD]/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "Hello"
|
| },
|
| {
|
|
|