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

Unified Diff: scripts/slave/recipes/legion/legion.expected/basic.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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/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 ecc4c946a65fa5e2d273b1742828405dddbc134f..3da519b8057f15c37019783016d041af50392902 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 = '[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'}]",
+ "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'}]",
"--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",
- "[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]"
},
@@ -100,46 +101,48 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/hello_world/task_test.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/hello_world/task_test.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/testing/legion/tools/legion.py",
+ "[SLAVE_BUILD]/src/testing/legion/tools/legion.py",
"run",
"--controller-isolated",
- "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolated",
+ "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolated",
"--task-name",
"hello_world_test",
"--isolate-server",
@@ -154,8 +157,9 @@
"INFO",
"--task",
"task-hash",
- "[CWD]/src/testing/legion/examples/hello_world/task_test.isolated"
+ "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolated"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Running test for hello_world_test",
"stdout": "/path/to/tmp/"
},
@@ -163,46 +167,48 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/subprocess/task.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/subprocess/task.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/testing/legion/tools/legion.py",
+ "[SLAVE_BUILD]/src/testing/legion/tools/legion.py",
"run",
"--controller-isolated",
- "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
+ "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
"--task-name",
"subprocess_test",
"--isolate-server",
@@ -217,8 +223,9 @@
"INFO",
"--task",
"task-hash",
- "[CWD]/src/testing/legion/examples/subprocess/task.isolated"
+ "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolated"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Running test for subprocess_test",
"stdout": "/path/to/tmp/"
},
@@ -226,64 +233,67 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/http_example/http_test.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/http_example/http_test.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/http_example/http_client.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/http_example/http_client.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/tools/swarming_client/isolate.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
"archive",
"--isolate",
- "[CWD]/src/testing/legion/examples/http_example/http_server.isolate",
+ "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolate",
"--isolated",
- "[CWD]/src/testing/legion/examples/http_example/http_server.isolated",
+ "[SLAVE_BUILD]/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",
- "[CWD]/src/testing/legion/tools/legion.py",
+ "[SLAVE_BUILD]/src/testing/legion/tools/legion.py",
"run",
"--controller-isolated",
- "[CWD]/src/testing/legion/examples/http_example/http_test.isolated",
+ "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolated",
"--task-name",
"http_test",
"--isolate-server",
@@ -298,11 +308,12 @@
"INFO",
"--task",
"http-client",
- "[CWD]/src/testing/legion/examples/http_example/http_client.isolated",
+ "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolated",
"--task",
"http-server",
- "[CWD]/src/testing/legion/examples/http_example/http_server.isolated"
+ "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolated"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Running test for http_test",
"stdout": "/path/to/tmp/"
},

Powered by Google App Engine
This is Rietveld 408576698