| Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| index b35bd6e58eb67785ef6fe62e5b16f186cd99048e..4c26e667873d499845cef8006e7b404212652f95 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json
|
| @@ -587,7 +587,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/android_webview/tools/cts_config/webview_cts_gcs_path.txt",
|
| + "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/android_webview/tools/cts_config/webview_cts_gcs_path.json",
|
| "/path/to/tmp/"
|
| ],
|
| "cwd": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_",
|
| @@ -595,11 +595,7 @@
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/build/android:%(PATH)s"
|
| },
|
| - "name": "Fetch for the name of the cts file",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@cts_file_name@android-cts-5.1_r5-linux_x86-arm.zip@@@",
|
| - "@@@STEP_LOG_END@cts_file_name@@@"
|
| - ]
|
| + "name": "Fetch CTS filename data"
|
| },
|
| {
|
| "cmd": [
|
| @@ -614,7 +610,7 @@
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/build/android:%(PATH)s"
|
| },
|
| - "name": "Fetch the expected failures tests for CTS from chromium checkout"
|
| + "name": "Fetch expected failures data"
|
| },
|
| {
|
| "cmd": [],
|
| @@ -687,8 +683,8 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| "----",
|
| "cp",
|
| - "gs://chromium-cts/android-cts-5.1_r5-linux_x86-arm.zip",
|
| - "[CACHE]/android_cts/android-cts-5.1_r5-linux_x86-arm.zip"
|
| + "gs://chromium-cts/cts_arm64_L.zip",
|
| + "[CACHE]/android_cts/cts_arm64_L.zip"
|
| ],
|
| "cwd": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_",
|
| "env": {
|
| @@ -712,7 +708,7 @@
|
| "PATH": "[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_WebView_CTS_L_MR1__dbg_/src/build/android:%(PATH)s"
|
| },
|
| "name": "Update CTS.Extract new CTS",
|
| - "stdin": "{\"output\": \"[CACHE]/android_cts/unzipped\", \"zip_file\": \"[CACHE]/android_cts/android-cts-5.1_r5-linux_x86-arm.zip\"}",
|
| + "stdin": "{\"output\": \"[CACHE]/android_cts/unzipped\", \"zip_file\": \"[CACHE]/android_cts/cts_arm64_L.zip\"}",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| ]
|
|
|