| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
 | 
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
 | 
| index 3ed350ef457d4abbe302f036f3a08c3cbbeb2503..331b9ca4502f3e78ba4dc3a89cd81722ddd0fd7d 100644
 | 
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
 | 
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
 | 
| @@ -506,6 +506,19 @@
 | 
|      ]
 | 
|    },
 | 
|    {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "AndroidWebViewTest",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| @@ -524,10 +537,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "AndroidWebViewTest",
 | 
| +    "name": "AndroidWebViewTest.AndroidWebViewTest",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -556,7 +569,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [AndroidWebViewTest]"
 | 
| +    "name": "AndroidWebViewTest.Upload to test-results [AndroidWebViewTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ChromePublicTest",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -577,10 +606,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ChromePublicTest",
 | 
| +    "name": "ChromePublicTest.ChromePublicTest",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -609,7 +638,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ChromePublicTest]"
 | 
| +    "name": "ChromePublicTest.Upload to test-results [ChromePublicTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ContentShellTest",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -630,10 +675,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ContentShellTest",
 | 
| +    "name": "ContentShellTest.ContentShellTest",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -662,7 +707,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ContentShellTest]"
 | 
| +    "name": "ContentShellTest.Upload to test-results [ContentShellTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ChromeSyncShellTest",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -683,10 +744,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ChromeSyncShellTest",
 | 
| +    "name": "ChromeSyncShellTest.ChromeSyncShellTest",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -715,7 +776,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Asan_Builder_Tests__dbg_/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ChromeSyncShellTest]"
 | 
| +    "name": "ChromeSyncShellTest.Upload to test-results [ChromeSyncShellTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -862,8 +926,7 @@
 | 
|    },
 | 
|    {
 | 
|      "name": "$result",
 | 
| -    "reason": "4 tests failed: ['AndroidWebViewTest', 'ChromePublicTest', 'ContentShellTest', 'ChromeSyncShellTest']",
 | 
|      "recipe_result": null,
 | 
| -    "status_code": 1
 | 
| +    "status_code": 0
 | 
|    }
 | 
|  ]
 | 
| 
 |