| Index: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
|
| index a8e2e6e997aa56b358b3a97b7d271c3d0ada1a0b..0c78ca4992811b213977d51e7a5bc93e87e44c49 100644
|
| --- a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
|
| +++ b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
|
| @@ -227,6 +227,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"omg_so_many_apks\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"apk_under_test\": \"second_apk\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"render_results_dir\": \"chrome/test/data/android/render_tests\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"test\": \"ChromePublicTest\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"test_apk\": \"one_apk\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| @@ -594,6 +595,18 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "ChromePublicTest",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
|
| + "@@@STEP_FAILURE@@@"
|
| + ]
|
| + },
|
| + {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -611,8 +624,9 @@
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "ChromePublicTest",
|
| + "name": "ChromePublicTest.ChromePublicTest",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "step returned non-zero exit code: 1",
|
| "@@@STEP_FAILURE@@@"
|
| ]
|
| @@ -621,6 +635,31 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[START_DIR]/src/build/android/render_tests/process_render_test_results.py",
|
| + "--output-html-file",
|
| + "/path/to/tmp/",
|
| + "--buildername",
|
| + "Android Tests",
|
| + "--build-number",
|
| + "571",
|
| + "--render-results-dir",
|
| + "chrome/test/data/android/render_tests"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "ChromePublicTest.[Render Tests] Upload Results",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "@@@STEP_LOG_LINE@render results@<!DOCTYPE html><html></html>@@@",
|
| + "@@@STEP_LOG_END@render results@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[build::chromium_android]/resources/test_results_presentation.py",
|
| "--json-file",
|
| "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
|
| @@ -631,10 +670,10 @@
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "ChromePublicTest: generate result details",
|
| + "name": "ChromePublicTest.ChromePublicTest: generate result details",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@result_details@<!DOCTYPE html><html></html>@@@",
|
| "@@@STEP_LOG_END@result_details@@@"
|
| ]
|
| @@ -663,7 +702,10 @@
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[START_DIR]/src/third_party/android_tools/sdk/platform-tools:[START_DIR]/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": [
|
|
|