scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json - Issue 591333002: [Android] Run java unit tests on the android tester bots.

Unified Diff: scripts/slave/recipes/android/tester.expected/android_rel_tests_recipe.json

Issue 591333002: [Android] Run java unit tests on the android tester bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: rebase Created 6 years, 3 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/android/tester.expected/android_dbg_tests_recipe__content_browsertests_failure.json ('k') | scripts/slave/recipes/android/tester.expected/no_compile_because_of_analyze.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0e517a9b870e8574894ac4f863b15f95c6c70eee..bb07018a4c4d116f54a455aa01c62f5941367253 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

@@ -137,7 +137,7 @@

"-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\"]}",

+ "{\"files\": [\"foo.cc\"], \"targets\": [\"mojo_test_apk\", \"android_webview_test_apk\", \"chrome_shell_test_apk\", \"content_shell_test_apk\", \"telemetry_unittests\", \"telemetry_perf_unittests\", \"junit_unit_tests\"]}",

"/path/to/tmp/json"

"env": {

@@ -148,12 +148,14 @@

"@@@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@ \"chrome_shell_test_apk\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"junit_unit_tests\"@@@",

"@@@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@ \"chrome_shell_test_apk\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"junit_unit_tests\"@@@",

"@@@STEP_LOG_LINE@json.output@ ]@@@",

"@@@STEP_LOG_LINE@json.output@}@@@",

"@@@STEP_LOG_END@json.output@@@"

@@ -186,7 +188,8 @@

"[BUILD]/goma",

"--",

"breakpad_unittests",

- "chrome_shell_test_apk"

+ "chrome_shell_test_apk",

+ "junit_unit_tests"

"env": {

"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

@@ -296,6 +299,21 @@

"cmd": [

"python",

"-u",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "junit",

+ "-s",

+ "junit_unit_tests",

+ "--verbose"

+ ],

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "junit_unit_tests"

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",

"--output-path",

"[SLAVE_BUILD]/src/out/Release/full_log",