Index: scripts/slave/recipes/legion/legion.expected/basic.json |
diff --git a/scripts/slave/recipes/legion/legion.expected/basic.json b/scripts/slave/recipes/legion/legion.expected/basic.json |
index 3da519b8057f15c37019783016d041af50392902..ecc4c946a65fa5e2d273b1742828405dddbc134f 100644 |
--- a/scripts/slave/recipes/legion/legion.expected/basic.json |
+++ b/scripts/slave/recipes/legion/legion.expected/basic.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
"--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]" |
}, |
@@ -101,48 +100,46 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolate", |
+ "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolated", |
+ "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for controller_test.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolate", |
+ "[CWD]/src/testing/legion/examples/hello_world/task_test.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolated", |
+ "[CWD]/src/testing/legion/examples/hello_world/task_test.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for task_test.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/testing/legion/tools/legion.py", |
+ "[CWD]/src/testing/legion/tools/legion.py", |
"run", |
"--controller-isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolated", |
+ "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolated", |
"--task-name", |
"hello_world_test", |
"--isolate-server", |
@@ -157,9 +154,8 @@ |
"INFO", |
"--task", |
"task-hash", |
- "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolated" |
+ "[CWD]/src/testing/legion/examples/hello_world/task_test.isolated" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Running test for hello_world_test", |
"stdout": "/path/to/tmp/" |
}, |
@@ -167,48 +163,46 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolate", |
+ "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolated", |
+ "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for subprocess_test.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolate", |
+ "[CWD]/src/testing/legion/examples/subprocess/task.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolated", |
+ "[CWD]/src/testing/legion/examples/subprocess/task.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for task.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/testing/legion/tools/legion.py", |
+ "[CWD]/src/testing/legion/tools/legion.py", |
"run", |
"--controller-isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolated", |
+ "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolated", |
"--task-name", |
"subprocess_test", |
"--isolate-server", |
@@ -223,9 +217,8 @@ |
"INFO", |
"--task", |
"task-hash", |
- "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolated" |
+ "[CWD]/src/testing/legion/examples/subprocess/task.isolated" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Running test for subprocess_test", |
"stdout": "/path/to/tmp/" |
}, |
@@ -233,67 +226,64 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolate", |
+ "[CWD]/src/testing/legion/examples/http_example/http_test.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolated", |
+ "[CWD]/src/testing/legion/examples/http_example/http_test.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for http_test.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolate", |
+ "[CWD]/src/testing/legion/examples/http_example/http_client.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolated", |
+ "[CWD]/src/testing/legion/examples/http_example/http_client.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for http_client.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py", |
+ "[CWD]/src/tools/swarming_client/isolate.py", |
"archive", |
"--isolate", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolate", |
+ "[CWD]/src/testing/legion/examples/http_example/http_server.isolate", |
"--isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolated", |
+ "[CWD]/src/testing/legion/examples/http_example/http_server.isolated", |
"--isolate-server", |
"https://omnibot-legion-isolate-server.appspot.com", |
"--config-variable", |
"multi_machine", |
"1" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "archive for http_server.isolate" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/testing/legion/tools/legion.py", |
+ "[CWD]/src/testing/legion/tools/legion.py", |
"run", |
"--controller-isolated", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolated", |
+ "[CWD]/src/testing/legion/examples/http_example/http_test.isolated", |
"--task-name", |
"http_test", |
"--isolate-server", |
@@ -308,12 +298,11 @@ |
"INFO", |
"--task", |
"http-client", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolated", |
+ "[CWD]/src/testing/legion/examples/http_example/http_client.isolated", |
"--task", |
"http-server", |
- "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolated" |
+ "[CWD]/src/testing/legion/examples/http_example/http_server.isolated" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Running test for http_test", |
"stdout": "/path/to/tmp/" |
}, |