Index: scripts/slave/recipes/chromium.expected/full_client_v8_fyi_Chromium_ASAN___debug.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_client_v8_fyi_Chromium_ASAN___debug.json b/scripts/slave/recipes/chromium.expected/full_client_v8_fyi_Chromium_ASAN___debug.json |
index 536897c3ed881fb8eca00c61e48eeaff4c1f76c1..d7975c98a9378ed4d086575f262225455d55d80d 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_client_v8_fyi_Chromium_ASAN___debug.json |
+++ b/scripts/slave/recipes/chromium.expected/full_client_v8_fyi_Chromium_ASAN___debug.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', 'v8_branch': 'branches/bleeding_edge', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'safesync_url': 'https://chromium-status.appspot.com/lkgr', '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', 'v8_branch': 'branches/bleeding_edge', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'safesync_url': 'https://chromium-status.appspot.com/lkgr', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_cr_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_revision\"}", |
"--git-cache-dir", |
- "[ROOT]/b/build/slave/cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -27,6 +27,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -101,6 +102,7 @@ |
}, |
{ |
"cmd": [], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma" |
}, |
{ |
@@ -111,16 +113,17 @@ |
"--platform", |
"linux-amd64", |
"--dest-directory", |
- "[CWD]/cipd", |
+ "[SLAVE_BUILD]/cipd", |
"--json-output", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma.install cipd", |
"~followup_annotations": [ |
"@@@STEP_NEST_LEVEL@1@@@", |
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
@@ -128,10 +131,10 @@ |
}, |
{ |
"cmd": [ |
- "fake_slave_build/cipd", |
+ "[SLAVE_BUILD]/cipd/cipd", |
"ensure", |
"--root", |
- "[ROOT]/b/build/slave/cache/cipd/goma", |
+ "[CACHE]/cipd/goma", |
"--list", |
"infra_internal/goma/client/linux-amd64 release", |
"--json-output", |
@@ -139,6 +142,7 @@ |
"--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@@@", |
@@ -160,9 +164,10 @@ |
"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_DEFINES": "asan=1 clang=1 component=shared_library gomadir='[ROOT]/b/build/slave/cache/cipd/goma' lsan=1 sanitizer_coverage=edge target_arch=x64 use_goma=1 v8_optimized_debug=1", |
+ "GYP_DEFINES": "asan=1 clang=1 component=shared_library gomadir='[CACHE]/cipd/goma' lsan=1 sanitizer_coverage=edge target_arch=x64 use_goma=1 v8_optimized_debug=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -171,17 +176,18 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/testing/scripts/get_compile_targets.py", |
+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
"Debug", |
"--paths", |
- "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
+ "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
"--properties", |
"{\"buildername\": \"Chromium ASAN - debug\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
@@ -193,12 +199,13 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[CWD]/src/testing/buildbot/client.v8.fyi.json", |
+ "[SLAVE_BUILD]/src/testing/buildbot/client.v8.fyi.json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read test spec", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/client.v8.fyi.json@@@", |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/client.v8.fyi.json@@@", |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
@@ -212,6 +219,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -221,10 +229,11 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--output-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -251,9 +260,9 @@ |
"--target", |
"Debug", |
"--src-dir", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
- "[ROOT]/b/build/slave/goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--build-data-dir", |
@@ -265,11 +274,12 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[ROOT]/b/build/slave/cache/cipd/goma", |
+ "[CACHE]/cipd/goma", |
"--clobber", |
"--", |
"chromium_builder_asan" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -284,9 +294,10 @@ |
"python", |
"-u", |
"\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", |
- "[CWD]/src/out/Debug", |
+ "[SLAVE_BUILD]/src/out/Debug", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "listdir build_dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[@@@", |
@@ -307,18 +318,19 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::archive]/resources/zip_archive.py", |
- "[TMP]/chrome_staging_tmp_1", |
+ "[TMP_BASE]/chrome_staging_tmp_1", |
"asan-linux-debug-v8-component-43426", |
"[\"file 1\", \"file 2\"]", |
- "[CWD]/src/out/Debug" |
+ "[SLAVE_BUILD]/src/out/Debug" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "zipping" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]/b/depot_tools/gsutil.py", |
+ "[DEPOT_TOOLS]/gsutil.py", |
"--", |
"-h", |
"x-goog-meta-Cr-Commit-Position:refs/heads/master@{#43426}", |
@@ -329,9 +341,10 @@ |
"cp", |
"-a", |
"public-read", |
- "[TMP]/chrome_staging_tmp_1/asan-linux-debug-v8-component-43426.zip", |
+ "[TMP_BASE]/chrome_staging_tmp_1/asan-linux-debug-v8-component-43426.zip", |
"gs://v8-asan/linux-debug/asan-linux-debug-v8-component-43426.zip" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/v8-asan/linux-debug/asan-linux-debug-v8-component-43426.zip@@@" |
@@ -342,8 +355,9 @@ |
"python", |
"-u", |
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n", |
- "[TMP]/chrome_staging_tmp_1/asan-linux-debug-v8-component-43426.zip" |
+ "[TMP_BASE]/chrome_staging_tmp_1/asan-linux-debug-v8-component-43426.zip" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "asan-linux-debug-v8-component-43426.zip", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |