Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json

Issue 2071673002: [Android] Support --timeout-scale for generated instrumentation tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_M__dbg_.json b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json
similarity index 95%
copy from scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_M__dbg_.json
copy to scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json
index a131ecbf2e36c6ce2093346683ef3e51afe21933..842a5b272ac4b2e6b37deb667ab4432512850e3c 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_M__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json
@@ -7,7 +7,7 @@
"--master",
"chromium.android",
"--builder",
- "Android Webview M (dbg)",
+ "Lollipop Low-end Tester",
"--slave",
"TestSlavename",
"--spec",
@@ -21,7 +21,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@1111111",
+ "src@HEAD",
"--force",
"--output_manifest"
],
@@ -34,7 +34,7 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -188,7 +188,7 @@
"--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\"}",
"--properties",
- "{\"buildername\": \"Android Webview M (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+ "{\"buildername\": \"Lollipop Low-end Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -207,7 +207,16 @@
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.android.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Lollipop Low-end Tester\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instrumentation_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"ChromePublicTest\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"timeout_scale\": 2@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -287,8 +296,10 @@
"RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",
"--target",
"Debug",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
+ "--build-url",
+ "gs://chromium-android-archive/chromium.android/Android arm Builder (dbg)/full-build-linux.zip",
+ "--build_revision",
+ "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--master-name",
"chromium.android",
"--build-number",
@@ -464,8 +475,7 @@
"--output-device-blacklist",
"/path/to/tmp/json",
"-t",
- "Debug",
- "--remove-system-webview"
+ "Debug"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -499,14 +509,14 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_system_webview_shell_layout_test_apk",
+ "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_public_test_apk",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
- "--additional-apk",
- "[SLAVE_BUILD]/src/out/Debug/apks/SystemWebView.apk",
+ "--timeout-scale",
+ "2",
"--adb-path",
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
@@ -514,7 +524,7 @@
"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"
},
- "name": "Instrumentation test SystemWebViewShellLayoutTest",
+ "name": "Instrumentation test ChromePublicTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
@@ -531,11 +541,11 @@
"--master-name",
"chromium.android",
"--builder-name",
- "Android Webview M (dbg)",
+ "Lollipop Low-end Tester",
"--build-number",
"571",
"--test-type",
- "SystemWebViewShellLayoutTest",
+ "ChromePublicTest",
"--test-results-server",
"test-results.appspot.com",
"--chrome-revision",
@@ -545,7 +555,7 @@
"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"
},
- "name": "Upload to test-results [SystemWebViewShellLayoutTest]"
+ "name": "Upload to test-results [ChromePublicTest]"
},
{
"cmd": [
@@ -592,7 +602,7 @@
"----",
"cp",
"[SLAVE_BUILD]/src/out/Debug/full_log",
- "gs://chromium-android/logcat_dumps/Android Webview M (dbg)/571"
+ "gs://chromium-android/logcat_dumps/Lollipop Low-end Tester/571"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -600,7 +610,7 @@
},
"name": "gsutil upload",
"~followup_annotations": [
- "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Webview M (dbg)/571@@@"
+ "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Lollipop Low-end Tester/571@@@"
]
},
{
@@ -659,7 +669,7 @@
},
{
"name": "$result",
- "reason": "1 tests failed: ['SystemWebViewShellLayoutTest']",
+ "reason": "1 tests failed: ['ChromePublicTest']",
"status_code": 1
}
]
« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698