| Index: scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json
|
| diff --git a/scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json b/scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json
|
| index 40437a36a217a27baa730c83005773fdbc0d0a4e..68235e6f9bf9339ab344f7e76556ebd774b0fbc0 100644
|
| --- a/scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json
|
| +++ b/scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json
|
| @@ -99,6 +99,67 @@
|
| "name": "gclient runhooks"
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "name": "read filter exclusion spec",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "diff",
|
| + "--cached",
|
| + "--name-only"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| + "name": "git diff to analyze patch",
|
| + "stdout": "/path/to/tmp/"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/gyp_chromium",
|
| + "--analyzer",
|
| + "{\"files\": [\"foo.cc\"], \"targets\": [\"mojo_test_apk\", \"android_webview_test_apk\", \"chrome_shell_test_apk\", \"content_shell_test_apk\", \"telemetry_unittests\", \"telemetry_perf_unittests\"]}",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "env": {
|
| + "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1"
|
| + },
|
| + "name": "analyze",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"breakpad_unittests\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chrome_shell_test_apk\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"targets\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"breakpad_unittests\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"chrome_shell_test_apk\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| "allow_subannotations": false,
|
| "cmd": [
|
| "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| @@ -202,48 +263,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "MojoTest",
|
| - "--verbose",
|
| - "--release"
|
| - ],
|
| - "name": "Instrumentation test MojoTest"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "--apk",
|
| - "AndroidWebView.apk",
|
| - "--apk_package",
|
| - "org.chromium.android_webview.shell",
|
| - "--release"
|
| - ],
|
| - "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",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "AndroidWebViewTest",
|
| - "--test_data",
|
| - "webview:android_webview/test/data/device_files",
|
| - "--verbose",
|
| - "--release"
|
| - ],
|
| - "name": "Instrumentation test AndroidWebViewTest"
|
| - },
|
| - {
|
| - "cmd": [
|
| "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| "--apk",
|
| "ChromeShell.apk",
|
| @@ -273,67 +292,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "--apk",
|
| - "ContentShell.apk",
|
| - "--apk_package",
|
| - "org.chromium.chontent_shell_apk",
|
| - "--release"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ContentShell.apk"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "ContentShellTest",
|
| - "--test_data",
|
| - "content:content/test/data/android/device_files",
|
| - "--verbose",
|
| - "--release"
|
| - ],
|
| - "name": "Instrumentation test ContentShellTest"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "telemetry_unittests",
|
| - "--verbose",
|
| - "--release"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "telemetry_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "gtest",
|
| - "-s",
|
| - "telemetry_perf_unittests",
|
| - "--verbose",
|
| - "--release"
|
| - ],
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "telemetry_perf_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
|
|