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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/swarming/staging.expected/win_Debug.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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
« no previous file with comments | « scripts/slave/recipes/swarming/staging.expected/one_fails.json ('k') | scripts/slave/recipes/swarming/staging.expected/win_Release.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/swarming/staging.expected/win_Debug.json
diff --git a/scripts/slave/recipes/swarming/staging.expected/win_Debug.json b/scripts/slave/recipes/swarming/staging.expected/win_Debug.json
index 7ea1cd43637f63f6287371fa926d65d0489d91bc..8b3b29293d064a195a8ea834a4906a5b71221514 100644
--- a/scripts/slave/recipes/swarming/staging.expected/win_Debug.json
+++ b/scripts/slave/recipes/swarming/staging.expected/win_Debug.json
@@ -8,7 +8,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -18,9 +17,8 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"config",
"--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', 'swarming_revision': '', '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', 'swarming_revision': '', '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'}]"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -43,7 +41,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -84,10 +81,9 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "[CWD]\\src\\tools\\swarming_client\\swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -101,10 +97,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_DEFINES": "chromium_win_pch=0 component=shared_library fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "chromium_win_pch=0 component=shared_library fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -115,10 +110,9 @@
"-u",
"RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]\\src\\out\\Debug",
+ "[CWD]\\src\\out\\Debug",
"--clean-isolated-files"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean isolated files"
},
{
@@ -136,9 +130,9 @@
"--target",
"Debug",
"--src-dir",
- "[SLAVE_BUILD]\\src",
+ "[CWD]\\src",
"--goma-cache-dir",
- "[GOMA_CACHE]",
+ "[ROOT]\\b\\build\\slave\\goma_cache",
"--build-tool",
"ninja",
"--compiler",
@@ -148,11 +142,10 @@
"--goma-service-account-json-file",
"C:\\creds\\service_accounts\\service-account-goma-client.json",
"--goma-dir",
- "[BUILD]\\goma",
+ "[ROOT]\\b\\build\\goma",
"--",
"chromium_swarm_tests"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -168,11 +161,11 @@
"-u",
"RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]\\src\\out\\Debug",
+ "[CWD]\\src\\out\\Debug",
"--src-dir",
- "[SLAVE_BUILD]\\src"
+ "[CWD]\\src"
],
- "cwd": "[SLAVE_BUILD]",
+ "cwd": "[CWD]",
"name": "remove_build_metadata"
},
{
@@ -181,9 +174,8 @@
"-u",
"\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
"/path/to/tmp/",
- "[SLAVE_BUILD]\\src\\out\\Debug\\*.isolated.gen.json"
+ "[CWD]\\src\\out\\Debug\\*.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "find isolated targets"
},
{
@@ -191,17 +183,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client",
+ "[CWD]\\src\\tools\\swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver-dev.appspot.com",
"--verbose",
- "[SLAVE_BUILD]\\src\\out\\Debug\\dummy_target_1.isolated.gen.json",
- "[SLAVE_BUILD]\\src\\out\\Debug\\dummy_target_2.isolated.gen.json"
+ "[CWD]\\src\\out\\Debug\\dummy_target_1.isolated.gen.json",
+ "[CWD]\\src\\out\\Debug\\dummy_target_2.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"SWARMING_PROFILE": "1"
},
@@ -219,7 +210,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "[CWD]\\src\\tools\\swarming_client\\swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -277,7 +268,6 @@
"--",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] dummy_target_1 on Windows",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -304,7 +294,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "[CWD]\\src\\tools\\swarming_client\\swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -362,7 +352,6 @@
"--",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] dummy_target_2 on Windows",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -394,9 +383,9 @@
"python",
"RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client",
+ "[CWD]\\src\\tools\\swarming_client",
"--temp-root-dir",
- "[TMP_BASE]",
+ "[TMP]",
"--merged-test-output",
"/path/to/tmp/json",
"--",
@@ -410,7 +399,6 @@
"2",
"dummy_target_1/Windows/[dummy has/TestBuilder/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dummy_target_1 on Windows",
"~followup_annotations": [
"@@@STEP_LINK@shard #0 isolated out@blah@@@"
@@ -436,7 +424,6 @@
"--chrome-revision",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [dummy_target_1]"
},
{
@@ -448,9 +435,9 @@
"python",
"RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client",
+ "[CWD]\\src\\tools\\swarming_client",
"--temp-root-dir",
- "[TMP_BASE]",
+ "[TMP]",
"--merged-test-output",
"/path/to/tmp/json",
"--",
@@ -464,7 +451,6 @@
"2",
"dummy_target_2/Windows/[dummy has/TestBuilder/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dummy_target_2 on Windows",
"~followup_annotations": [
"@@@STEP_LINK@shard #0 isolated out@blah@@@"
@@ -490,7 +476,6 @@
"--chrome-revision",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [dummy_target_2]"
},
{
« no previous file with comments | « scripts/slave/recipes/swarming/staging.expected/one_fails.json ('k') | scripts/slave/recipes/swarming/staging.expected/win_Release.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698