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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1848513003: Switch Android Asan Builder Tests on chromium.fyi to chromium recipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Spaces Created 4 years, 9 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/recipe_modules/chromium_tests/chromium_fyi.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/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
similarity index 82%
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
index 6942e62054eae0df5fa4bd5a4b933272de9e5a9a..62ad9a6ecec43267ea0bafa5afe3f9071b603d27 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
@@ -7,7 +7,7 @@
"--master",
"chromium.fyi",
"--builder",
- "ClangToTAndroidASan tester",
+ "Android Asan Builder Tests (dbg)",
"--slave",
"TestSlavename",
"--spec",
@@ -21,7 +21,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@1111111",
+ "src@HEAD",
"--force",
"--output_manifest"
],
@@ -35,7 +35,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\": {@@@",
@@ -106,9 +106,9 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "GYP_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android asan=1 clang=1 clang_use_chrome_plugins=0 component=shared_library fastbuild=1 target_arch=ia32",
- "LLVM_FORCE_HEAD_REVISION": "YES",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 target_arch=arm",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -126,7 +126,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\": \"ClangToTAndroidASan tester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+ "{\"buildername\": \"Android Asan Builder Tests (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
"cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
@@ -205,81 +205,65 @@
"cmd": [
"python",
"-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/src/out/Debug"
+ "RECIPE_MODULE[build::goma]/resources/ensure_goma.py",
+ "--target-dir",
+ "[SLAVE_BUILD]/src/build/goma/client",
+ "--download-from-google-storage-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/download_from_google_storage.py"
],
"cwd": "[SLAVE_BUILD]",
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "name": "ensure_goma"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",
- "--target",
- "Debug",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "gen",
+ "-m",
"chromium.fyi",
- "--build-number",
- "571"
+ "-b",
+ "Android Asan Builder Tests (dbg)",
+ "--config-file",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "--goma-dir",
+ "[SLAVE_BUILD]/src/build/goma/client",
+ "//out/Debug"
],
"cwd": "[SLAVE_BUILD]",
- "name": "extract build"
+ "name": "generate_build_files"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::adb]/resources/list_devices.py",
- "['[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@[@@@",
- "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
"python",
- "-u",
- "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
- "014E1F310401C009"
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "--ninja-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+ "--target",
+ "Debug",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--build-tool",
+ "ninja",
+ "--goma-dir",
+ "[SLAVE_BUILD]/src/build/goma/client",
+ "--",
+ "android_webview_test_apk",
+ "chrome_public_test_apk",
+ "chrome_sync_shell_test_apk",
+ "content_shell_test_apk"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Root devices",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'root'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (device)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "compile"
},
{
"cmd": [
@@ -302,7 +286,6 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "spawn_logcat_monitor"
@@ -318,7 +301,6 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "authorize_adb_devices"
@@ -335,7 +317,6 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "device_status_check",
@@ -448,28 +429,12 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "provision_devices"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh",
- "--lib",
- "[SLAVE_BUILD]/src/third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/lib/linux/libclang_rt.asan-arm-android.so",
- "--device",
- "07a00ca4"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
- },
- "name": "asan_device_setup.sh 07a00ca4"
- },
- {
- "cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
@@ -482,7 +447,7 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"[\"07a00ca4\"]",
"chromium.fyi",
- "ClangToTAndroidASan tester",
+ "Android Asan Builder Tests (dbg)",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
@@ -491,72 +456,177 @@
},
{
"cmd": [
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+ "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
+ "-v",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "install AndroidWebView.apk"
+ },
+ {
+ "cmd": [
"python",
"-u",
"[SLAVE_BUILD]/src/build/android/test_runner.py",
- "junit",
- "-s",
- "base_junit_tests",
+ "instrumentation",
+ "--test-apk",
+ "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebViewTest.apk",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--logcat-output-file",
+ "/path/to/tmp/",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
+ "--isolate-file-path",
+ "android_webview/android_webview_test_apk.isolate",
+ "--tool=asan",
+ "--flakiness-dashboard-server",
+ "test-results.appspot.com",
"--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
- },
- "name": "base_junit_tests",
+ "name": "Instrumentation test AndroidWebViewTest",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
},
{
"cmd": [
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
+ "-v",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "install ChromePublic.apk"
+ },
+ {
+ "cmd": [
"python",
"-u",
"[SLAVE_BUILD]/src/build/android/test_runner.py",
- "gtest",
- "-s",
- "components_browsertests",
+ "instrumentation",
+ "--test-apk",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTest.apk",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose",
- "--isolate_file_path=[SLAVE_BUILD]/src/components/components_browsertests.isolate",
+ "--logcat-output-file",
+ "/path/to/tmp/",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
+ "--additional-apk",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTestSupport.apk",
+ "--additional-apk",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",
+ "--isolate-file-path",
+ "chrome/chrome_public_test_apk.isolate",
"--tool=asan",
- "--flakiness-dashboard-server=test-results.appspot.com",
+ "--flakiness-dashboard-server",
+ "test-results.appspot.com",
+ "--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
+ "name": "Instrumentation test ChromePublicTest",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ContentShell.apk",
+ "-v",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "components_browsertests"
+ "name": "install ContentShell.apk"
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/src/build/android/test_runner.py",
- "gtest",
- "-s",
- "gfx_unittests",
+ "instrumentation",
+ "--test-apk",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ContentShellTest.apk",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose",
+ "--logcat-output-file",
+ "/path/to/tmp/",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ContentShell.apk",
+ "--isolate-file-path",
+ "content/content_shell_test_apk.isolate",
"--tool=asan",
- "--flakiness-dashboard-server=test-results.appspot.com",
+ "--flakiness-dashboard-server",
+ "test-results.appspot.com",
+ "--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
+ "name": "Instrumentation test ContentShellTest",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
+ "-v",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "gfx_unittests"
+ "name": "install ChromeSyncShell.apk"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "instrumentation",
+ "--test-apk",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShellTest.apk",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--logcat-output-file",
+ "/path/to/tmp/",
+ "--apk-under-test",
+ "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
+ "--tool=asan",
+ "--flakiness-dashboard-server",
+ "test-results.appspot.com",
+ "--verbose",
+ "--json-results-file",
+ "/path/to/tmp/json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "Instrumentation test ChromeSyncShellTest",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+ ]
},
{
"cmd": [
@@ -597,26 +667,25 @@
"----",
"cp",
"[SLAVE_BUILD]/src/out/Debug/full_log",
- "gs://chromium-android/logcat_dumps/ClangToTAndroidASan tester/571"
+ "gs://chromium-android/logcat_dumps/Android Asan Builder Tests (dbg)/571"
],
"cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
- "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/ClangToTAndroidASan tester/571@@@"
+ "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Asan Builder Tests (dbg)/571@@@"
]
},
{
"cmd": [
"[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
"--arch",
- "x86",
+ "arm",
"--more-info",
"[SLAVE_BUILD]/src/out/Debug/full_log"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_with_logcat_dump"
@@ -631,7 +700,6 @@
"cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_for_tombstones"
@@ -645,7 +713,6 @@
"cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
- "LLVM_FORCE_HEAD_REVISION": "YES",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_for_asan"
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698