| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| index 38dcaa6d1d3daa8c0f24a9e582474e2daf50c012..655c8ca5d7eca2df10020f59e44df6fe900214db 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| @@ -30,7 +30,6 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -104,7 +103,6 @@
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -119,7 +117,6 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.install cipd",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -144,7 +141,6 @@
|
| "--service-account-json",
|
| "/creds/service_accounts/service-account-goma-client.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.ensure_installed",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -166,7 +162,6 @@
|
| "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -180,7 +175,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -205,7 +199,6 @@
|
| "--properties",
|
| "{\"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -220,7 +213,6 @@
|
| "[SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json@@@",
|
| @@ -236,7 +228,6 @@
|
| "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| @@ -282,7 +273,6 @@
|
| "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read filter exclusion spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
|
| @@ -305,7 +295,6 @@
|
| "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "analyze",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
|
| @@ -345,7 +334,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -357,7 +345,6 @@
|
| "[SLAVE_BUILD]/src/out/Release",
|
| "--clean-isolated-files"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean isolated files"
|
| },
|
| {
|
| @@ -378,7 +365,6 @@
|
| "gl_tests\n",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -424,7 +410,6 @@
|
| "gl_tests",
|
| "gl_tests_run"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -461,7 +446,6 @@
|
| "--verbose",
|
| "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -476,7 +460,6 @@
|
| "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "mark: before_tests"
|
| },
|
| {
|
| @@ -548,7 +531,6 @@
|
| "--",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] gl_tests (with patch) on Ubuntu-12.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -589,7 +571,6 @@
|
| "1",
|
| "gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gl_tests (with patch) on Ubuntu-12.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@shard #0 isolated out@blah@@@"
|
| @@ -615,7 +596,6 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [gl_tests (with patch) on Ubuntu-12.04]"
|
| },
|
| {
|
|
|