| Index: scripts/slave/recipe_modules/chromium_android/example.expected/perf_adb_vendor_keys_basic.json
|
| diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/perf_adb_vendor_keys_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/perf_adb_vendor_keys_basic.json
|
| index 7561d92e1f5f70482ef24adc5a99fa2429406550..467454a509624eb369918d5411c003e144279591 100644
|
| --- a/scripts/slave/recipe_modules/chromium_android/example.expected/perf_adb_vendor_keys_basic.json
|
| +++ b/scripts/slave/recipe_modules/chromium_android/example.expected/perf_adb_vendor_keys_basic.json
|
| @@ -6,7 +6,6 @@
|
| "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
|
| "[SLAVE_BUILD]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup index.lock",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -32,7 +31,6 @@
|
| "--spec",
|
| "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -46,7 +44,6 @@
|
| ".",
|
| "[DEPOT_TOOLS]/gclient"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gclient revert"
|
| },
|
| {
|
| @@ -64,7 +61,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -114,7 +110,6 @@
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -139,7 +134,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -158,7 +152,6 @@
|
| "foo",
|
| "src/repo"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tree truth steps"
|
| },
|
| {
|
| @@ -169,7 +162,6 @@
|
| "[SLAVE_BUILD]/src/chrome/VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get version"
|
| },
|
| {
|
| @@ -186,7 +178,6 @@
|
| "gs://build-bucket/build_product.zip",
|
| "[SLAVE_BUILD]/src/out/build_product.zip"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil download_build_product"
|
| },
|
| {
|
| @@ -214,7 +205,6 @@
|
| "['[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@[@@@",
|
| @@ -231,7 +221,6 @@
|
| "[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@@@@",
|
| @@ -253,7 +242,6 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -270,7 +258,6 @@
|
| "--adb-path",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -288,7 +275,6 @@
|
| "--known-devices-file",
|
| "[BUILD]/site_config/.known_devices"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -402,7 +388,6 @@
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -420,7 +405,6 @@
|
| "--known-devices-file",
|
| "[BUILD]/site_config/.known_devices"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -536,7 +520,6 @@
|
| "--reboot-timeout",
|
| "1800"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -556,7 +539,6 @@
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| @@ -591,7 +573,6 @@
|
| "--release",
|
| "--official-build"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| @@ -609,7 +590,6 @@
|
| "--gtest_filter=WebRtc*",
|
| "--tool=asan"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -623,7 +603,6 @@
|
| "-w",
|
| "[SLAVE_BUILD]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "prepare bisect perf regression"
|
| },
|
| {
|
| @@ -636,7 +615,6 @@
|
| "--path_to_config",
|
| "test.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "run bisect perf regression"
|
| },
|
| {
|
| @@ -649,7 +627,6 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -660,7 +637,6 @@
|
| "--more-info",
|
| "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| @@ -676,7 +652,6 @@
|
| "-s",
|
| "-w"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| @@ -691,7 +666,6 @@
|
| "-l",
|
| "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ADB_VENDOR_KEYS": "[BUILD]/site_config/.adb_key",
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
|
|