| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| index 4223827ac08eee77279819af5bfad91492f459f9..93d65a3a1f8ad0abbbc93b4dad2a78622347d6d2 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_blink_rel.json
|
| @@ -11,13 +11,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--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', '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 = '[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']",
|
| "--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",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]/b/build/slave/cache_dir",
|
| "--issue",
|
| "12853011",
|
| "--patchset",
|
| @@ -32,7 +32,6 @@
|
| "src/third_party/WebKit@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -107,7 +106,6 @@
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -118,17 +116,16 @@
|
| "--platform",
|
| "linux-386",
|
| "--dest-directory",
|
| - "[SLAVE_BUILD]/cipd",
|
| + "[CWD]/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\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/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@@@"
|
| @@ -136,10 +133,10 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "ensure",
|
| "--root",
|
| - "[CACHE]/cipd/goma",
|
| + "[ROOT]/b/build/slave/cache/cipd/goma",
|
| "--list",
|
| "infra_internal/goma/client/linux-386 release",
|
| "--json-output",
|
| @@ -147,7 +144,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@@@",
|
| @@ -169,13 +165,12 @@
|
| "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 dcheck_always_on=1 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]"
|
| + "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 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]"
|
| },
|
| "name": "gclient runhooks (with patch)"
|
| },
|
| @@ -183,18 +178,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[CWD]/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"android_blink_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -206,13 +200,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json",
|
| + "[CWD]/src/testing/buildbot/chromium.webkit.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json@@@",
|
| + "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.webkit.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -224,7 +217,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -238,10 +231,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
|
| + "[CWD]/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'@@@",
|
| @@ -264,7 +256,6 @@
|
| "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "analyze",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
|
| @@ -304,7 +295,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -312,12 +302,11 @@
|
| "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",
|
| - "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| + "[CWD]/src/out/Release/debug_info_dumps",
|
| + "[CWD]/src/out/Release/test_logs",
|
| + "[CWD]/src/out/build_product.zip",
|
| + "[CWD]/src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -338,30 +327,28 @@
|
| {
|
| "allow_subannotations": false,
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| - "[SLAVE_BUILD]/src",
|
| + "[CWD]/src/build/tree_truth.sh",
|
| + "[CWD]/src",
|
| "src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tree truth steps"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "[CWD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "tryserver.chromium.android",
|
| "-b",
|
| "android_blink_rel",
|
| "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "[CWD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| - "[CACHE]/cipd/goma",
|
| + "[ROOT]/b/build/slave/cache/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_build_files (with patch)"
|
| },
|
| {
|
| @@ -379,9 +366,9 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[CWD]/src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]/b/build/slave/goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -391,7 +378,7 @@
|
| "--goma-service-account-json-file",
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[CACHE]/cipd/goma",
|
| + "[ROOT]/b/build/slave/cache/cipd/goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| "--",
|
| @@ -399,10 +386,9 @@
|
| "blink_tests",
|
| "webkit_unit_tests_apk"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile (with patch)",
|
| "~followup_annotations": [
|
| @@ -416,7 +402,6 @@
|
| "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "mark: before_tests"
|
| },
|
| {
|
| @@ -424,10 +409,9 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::adb]/resources/list_devices.py",
|
| - "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| + "['[CWD]/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@[@@@",
|
| @@ -441,10 +425,9 @@
|
| "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",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "014E1F310401C009"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Root devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -463,25 +446,23 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/symlink.py",
|
| + "[CWD]/src/build/symlink.py",
|
| "-f",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[CWD]/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",
|
| "--",
|
| - "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[CWD]/src/build/android/adb_logcat_monitor.py",
|
| + "[CWD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -492,29 +473,27 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[CWD]/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": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "authorize_adb_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
|
| + "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[CWD]/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| - "[BUILD]/site_config/.known_devices"
|
| + "[ROOT]/b/build/site_config/.known_devices"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status_check",
|
| "~followup_annotations": [
|
| @@ -616,18 +595,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| + "[CWD]/src/build/android/provision_devices.py",
|
| "-t",
|
| "Release",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[CWD]/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": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| @@ -642,32 +620,30 @@
|
| "/tmp/device_monitor.pid",
|
| "--",
|
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "tryserver.chromium.android",
|
| "android_blink_rel",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| + "[CWD]/src/out/bad_devices.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_blink_heap_unittests",
|
| + "[CWD]/src/out/Release/bin/run_blink_heap_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[CWD]/src/out/bad_devices.json",
|
| "--verbose",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "blink_heap_unittests (with patch)"
|
| },
|
| @@ -675,18 +651,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_webkit_unit_tests",
|
| + "[CWD]/src/out/Release/bin/run_webkit_unit_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[CWD]/src/out/bad_devices.json",
|
| "--verbose",
|
| "--flakiness-dashboard-server=test-results.appspot.com",
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "webkit_unit_tests (with patch)"
|
| },
|
| @@ -709,13 +684,13 @@
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| - "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",
|
| + "[ROOT]/b/build/scripts/slave/chromium/layout_test_wrapper.py",
|
| "--target",
|
| "Release",
|
| "-o",
|
| - "[SLAVE_BUILD]/layout-test-results",
|
| + "[CWD]/layout-test-results",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]/src/out",
|
| + "[CWD]/src/out",
|
| "--json-test-results",
|
| "/path/to/tmp/json",
|
| "--test-results-server",
|
| @@ -729,7 +704,6 @@
|
| "--platform",
|
| "android"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "webkit_tests (with patch)",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
|
| @@ -739,11 +713,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/chromium/archive_layout_test_results.py",
|
| + "[ROOT]/b/build/scripts/slave/chromium/archive_layout_test_results.py",
|
| "--results-dir",
|
| - "[SLAVE_BUILD]/layout-test-results",
|
| + "[CWD]/layout-test-results",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]/src/out",
|
| + "[CWD]/src/out",
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| @@ -751,7 +725,6 @@
|
| "--gs-bucket",
|
| "gs://chromium-layout-test-archives"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "archive_webkit_tests_results",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/android_blink_rel/571/layout-test-results/results.html@@@",
|
| @@ -768,19 +741,17 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| + "[CWD]/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[CWD]/src/out/Release/full_log",
|
| + "[CWD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -789,7 +760,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "--force-version",
|
| "4.7",
|
| "-o",
|
| @@ -798,10 +769,9 @@
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log",
|
| + "[CWD]/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/android_blink_rel/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_blink_rel/571@@@"
|
| @@ -809,32 +779,30 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| + "[CWD]/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log"
|
| + "[CWD]/src/out/Release/full_log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| + "[CWD]/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -843,9 +811,8 @@
|
| "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",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| + "[CWD]/src/out/Release/test_logs/*.log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|