Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json |
index 1faef319c0c83afcae6b67af3e8cde2c3756ea23..6b1f3fcb52bfdabdebb8b79167d5830ffa24735b 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.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'}]\ntarget_os = ['android']", |
+ "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'}]\ntarget_os = ['android']", |
"--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]" |
}, |
@@ -98,6 +99,7 @@ |
}, |
{ |
"cmd": [], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "ensure_goma" |
}, |
{ |
@@ -108,16 +110,17 @@ |
"--platform", |
"linux-386", |
"--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@@@" |
@@ -125,10 +128,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-386 release", |
"--json-output", |
@@ -136,6 +139,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@@@", |
@@ -157,12 +161,13 @@ |
"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", |
"GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library emma_coverage=1 emma_filter='org.chromium.*' fastbuild=1 gomadir='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=arm use_goma=1", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ "GYP_DEFINES": "OS=android component=static_library emma_coverage=1 emma_filter='org.chromium.*' fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1", |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
}, |
@@ -170,17 +175,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\": \"Android Coverage (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
@@ -192,12 +198,13 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[CWD]/src/testing/buildbot/chromium.fyi.json", |
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read test spec", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.fyi.json@@@", |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@", |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
@@ -211,6 +218,7 @@ |
"python", |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cleanup_temp" |
}, |
{ |
@@ -218,11 +226,12 @@ |
"python", |
"-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[CWD]/src/out/Debug/debug_info_dumps", |
- "[CWD]/src/out/Debug/test_logs", |
- "[CWD]/src/out/build_product.zip", |
- "[CWD]/src" |
+ "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", |
+ "[SLAVE_BUILD]/src/out/Debug/test_logs", |
+ "[SLAVE_BUILD]/src/out/build_product.zip", |
+ "[SLAVE_BUILD]/src" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "clean local files", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -243,10 +252,11 @@ |
{ |
"allow_subannotations": false, |
"cmd": [ |
- "[CWD]/src/build/tree_truth.sh", |
- "[CWD]/src", |
+ "[SLAVE_BUILD]/src/build/tree_truth.sh", |
+ "[SLAVE_BUILD]/src", |
"src" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "tree truth steps" |
}, |
{ |
@@ -254,8 +264,9 @@ |
"python", |
"-u", |
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
- "[CWD]/src/out/Debug" |
+ "[SLAVE_BUILD]/src/out/Debug" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rmtree build directory", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -285,6 +296,7 @@ |
"--build-number", |
"571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "extract build" |
}, |
{ |
@@ -292,9 +304,10 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::adb]/resources/list_devices.py", |
- "['[CWD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']", |
+ "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "List adb devices", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@[@@@", |
@@ -308,9 +321,10 @@ |
"python", |
"-u", |
"\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
"014E1F310401C009" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Root devices", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -329,23 +343,25 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/symlink.py", |
+ "[SLAVE_BUILD]/src/build/symlink.py", |
"-f", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
"~/adb" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "create adb symlink" |
}, |
{ |
"cmd": [ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", |
"--", |
- "[CWD]/src/build/android/adb_logcat_monitor.py", |
- "[CWD]/src/out/logcat" |
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", |
+ "[SLAVE_BUILD]/src/out/logcat" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "spawn_logcat_monitor" |
}, |
@@ -356,27 +372,29 @@ |
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py", |
"--verbose", |
"--adb-path", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb" |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "authorize_adb_devices" |
}, |
{ |
"cmd": [ |
- "[CWD]/src/build/android/buildbot/bb_device_status_check.py", |
+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", |
"--json-output", |
"/path/to/tmp/json", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--known-devices-file", |
- "[ROOT]/b/build/site_config/.known_devices" |
+ "[BUILD]/site_config/.known_devices" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "device_status_check", |
"~followup_annotations": [ |
@@ -478,17 +496,18 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/android/provision_devices.py", |
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py", |
"-t", |
"Debug", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--output-device-blacklist", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "provision_devices" |
}, |
@@ -503,28 +522,30 @@ |
"/tmp/device_monitor.pid", |
"--", |
"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py", |
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
"[\"07a00ca4\"]", |
"chromium.fyi", |
"Android Coverage (dbg)", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json" |
+ "[SLAVE_BUILD]/src/out/bad_devices.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "spawn_device_monitor" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/out/Debug/bin/run_android_webview_test_apk", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_android_webview_test_apk", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
"--coverage-dir", |
- "[CWD]/src/out/Debug/coverage", |
+ "[SLAVE_BUILD]/src/out/Debug/coverage", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Instrumentation test AndroidWebViewTest", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -552,21 +573,23 @@ |
"--chrome-revision", |
"refs/heads/master@{#170242}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Upload to test-results [AndroidWebViewTest]" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/out/Debug/bin/run_chrome_public_test_apk", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_public_test_apk", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
"--coverage-dir", |
- "[CWD]/src/out/Debug/coverage", |
+ "[SLAVE_BUILD]/src/out/Debug/coverage", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Instrumentation test ChromePublicTest", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -594,21 +617,23 @@ |
"--chrome-revision", |
"refs/heads/master@{#170242}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Upload to test-results [ChromePublicTest]" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/out/Debug/bin/run_content_shell_test_apk", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_content_shell_test_apk", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
"--coverage-dir", |
- "[CWD]/src/out/Debug/coverage", |
+ "[SLAVE_BUILD]/src/out/Debug/coverage", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Instrumentation test ContentShellTest", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -636,21 +661,23 @@ |
"--chrome-revision", |
"refs/heads/master@{#170242}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Upload to test-results [ContentShellTest]" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/out/Debug/bin/run_chrome_sync_shell_test_apk", |
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_sync_shell_test_apk", |
"--blacklist-file", |
- "[CWD]/src/out/bad_devices.json", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
"--coverage-dir", |
- "[CWD]/src/out/Debug/coverage", |
+ "[SLAVE_BUILD]/src/out/Debug/coverage", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Instrumentation test ChromeSyncShellTest", |
"~followup_annotations": [ |
"step returned non-zero exit code: 1", |
@@ -678,21 +705,23 @@ |
"--chrome-revision", |
"refs/heads/master@{#170242}" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Upload to test-results [ChromeSyncShellTest]" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/android/generate_emma_html.py", |
+ "[SLAVE_BUILD]/src/build/android/generate_emma_html.py", |
"--coverage-dir", |
- "[CWD]/src/out/Debug/coverage", |
+ "[SLAVE_BUILD]/src/out/Debug/coverage", |
"--metadata-dir", |
- "[CWD]/src/out/Debug", |
+ "[SLAVE_BUILD]/src/out/Debug", |
"--cleanup", |
"--output", |
- "[CWD]/src/out/Debug/coverage/coverage_html/index.html" |
+ "[SLAVE_BUILD]/src/out/Debug/coverage/coverage_html/index.html" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Generate coverage report" |
}, |
{ |
@@ -704,7 +733,7 @@ |
"--diff-filter", |
"A" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Finding changed files matching diff filter: A", |
"stdout": "/path/to/tmp/" |
}, |
@@ -716,6 +745,7 @@ |
"fake/file1.java", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Finding lines changed in added file fake/file1.java" |
}, |
{ |
@@ -726,6 +756,7 @@ |
"fake/file2.java;", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Finding lines changed in added file fake/file2.java;" |
}, |
{ |
@@ -736,6 +767,7 @@ |
"fake/file3.java", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Finding lines changed in added file fake/file3.java" |
}, |
{ |
@@ -747,7 +779,7 @@ |
"--diff-filter", |
"M" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Finding changed files matching diff filter: M", |
"stdout": "/path/to/tmp/" |
}, |
@@ -759,7 +791,7 @@ |
"-s", |
"fake/file1.java" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Finding lines changed in modified file fake/file1.java", |
"stdout": "/path/to/tmp/" |
}, |
@@ -771,7 +803,7 @@ |
"-s", |
"fake/file2.java;" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Finding lines changed in modified file fake/file2.java;", |
"stdout": "/path/to/tmp/" |
}, |
@@ -783,7 +815,7 @@ |
"-s", |
"fake/file3.java" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Finding lines changed in modified file fake/file3.java", |
"stdout": "/path/to/tmp/" |
}, |
@@ -793,8 +825,9 @@ |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
"{\"fake/file1.java\": [], \"fake/file2.java;\": [], \"fake/file3.java\": []}", |
- "[TMP]/coverage_tmp_1/file_changes.json" |
+ "[TMP_BASE]/coverage_tmp_1/file_changes.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Saving changed lines for revision." |
}, |
{ |
@@ -806,11 +839,11 @@ |
"--out", |
"/path/to/tmp/json", |
"--emma-dir", |
- "[CWD]/src/out/Debug/coverage/coverage_html", |
+ "[SLAVE_BUILD]/src/out/Debug/coverage/coverage_html", |
"--lines-for-coverage", |
- "[TMP]/coverage_tmp_1/file_changes.json" |
+ "[TMP_BASE]/coverage_tmp_1/file_changes.json" |
], |
- "cwd": "[CWD]/src", |
+ "cwd": "[SLAVE_BUILD]/src", |
"name": "Incremental coverage report", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -858,17 +891,19 @@ |
"--pid-file-path", |
"/tmp/device_monitor.pid" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "shutdown_device_monitor" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/src/build/android/adb_logcat_printer.py", |
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", |
"--output-path", |
- "[CWD]/src/out/Debug/full_log", |
- "[CWD]/src/out/logcat" |
+ "[SLAVE_BUILD]/src/out/Debug/full_log", |
+ "[SLAVE_BUILD]/src/out/logcat" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "logcat_dump" |
}, |
{ |
@@ -877,16 +912,17 @@ |
"-u", |
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
"--", |
- "[ROOT]/b/depot_tools/gsutil.py", |
+ "[DEPOT_TOOLS]/gsutil.py", |
"--force-version", |
"4.7", |
"-o", |
"GSUtil:parallel_composite_upload_threshold=50M", |
"----", |
"cp", |
- "[CWD]/src/out/Debug/full_log", |
+ "[SLAVE_BUILD]/src/out/Debug/full_log", |
"gs://chromium-android/logcat_dumps/Android Coverage (dbg)/571" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gsutil upload", |
"~followup_annotations": [ |
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Coverage (dbg)/571@@@" |
@@ -894,30 +930,32 @@ |
}, |
{ |
"cmd": [ |
- "[CWD]/src/third_party/android_platform/development/scripts/stack", |
+ "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack", |
"--arch", |
"arm", |
"--more-info", |
- "[CWD]/src/out/Debug/full_log" |
+ "[SLAVE_BUILD]/src/out/Debug/full_log" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug", |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "stack_tool_with_logcat_dump" |
}, |
{ |
"cmd": [ |
- "[CWD]/src/build/android/tombstones.py", |
+ "[SLAVE_BUILD]/src/build/android/tombstones.py", |
"-a", |
"-s", |
"-w" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug", |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s" |
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "stack_tool_for_tombstones" |
}, |
@@ -926,8 +964,9 @@ |
"python", |
"-u", |
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n", |
- "[CWD]/src/out/Debug/test_logs/*.log" |
+ "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "test_report", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |