| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 # | 5 # |
| 6 # Bash functions used by buildbot annotator scripts for the android | 6 # Bash functions used by buildbot annotator scripts for the android |
| 7 # build of chromium. Executing this script should not perform actions | 7 # build of chromium. Executing this script should not perform actions |
| 8 # other than setting variables and defining of functions. | 8 # other than setting variables and defining of functions. |
| 9 | 9 |
| 10 # Number of jobs on the compile line; e.g. make -j"${JOBS}" | 10 # Number of jobs on the compile line; e.g. make -j"${JOBS}" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 local EXTRA_FLAGS=${2} | 266 local EXTRA_FLAGS=${2} |
| 267 local INSTRUMENTATION_FLAGS="-vvv" | 267 local INSTRUMENTATION_FLAGS="-vvv" |
| 268 INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}" | 268 INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}" |
| 269 INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}" | 269 INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}" |
| 270 build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS} | 270 build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS} |
| 271 } | 271 } |
| 272 | 272 |
| 273 # Run content shell instrumentation test on device. | 273 # Run content shell instrumentation test on device. |
| 274 function bb_run_instrumentation_tests { | 274 function bb_run_instrumentation_tests { |
| 275 build/android/adb_install_content_shell | 275 build/android/adb_install_content_shell |
| 276 local TEST_APK="content_shell_test/ContentShellTest-debug" | 276 local TEST_APK="ContentShellTest" |
| 277 # Use -I to install the test apk only on the first run. | 277 # Use -I to install the test apk only on the first run. |
| 278 # TODO(bulach): remove the second once we have a Smoke test. | 278 # TODO(bulach): remove the second once we have a Smoke test. |
| 279 bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke" | 279 bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke" |
| 280 bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest" | 280 bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest" |
| 281 bb_run_instrumentation_test ${TEST_APK} "-A MediumTest" | 281 bb_run_instrumentation_test ${TEST_APK} "-A MediumTest" |
| 282 bb_run_instrumentation_test ${TEST_APK} "-A LargeTest" | 282 bb_run_instrumentation_test ${TEST_APK} "-A LargeTest" |
| 283 } | 283 } |
| 284 | 284 |
| 285 # Zip and archive a build. | 285 # Zip and archive a build. |
| 286 function bb_zip_build { | 286 function bb_zip_build { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 ) | 350 ) |
| 351 } | 351 } |
| 352 | 352 |
| 353 # Retrieve a packed json property using python | 353 # Retrieve a packed json property using python |
| 354 function bb_get_json_prop { | 354 function bb_get_json_prop { |
| 355 local JSON="$1" | 355 local JSON="$1" |
| 356 local PROP="$2" | 356 local PROP="$2" |
| 357 | 357 |
| 358 python -c "import json; print json.loads('$JSON').get('$PROP')" | 358 python -c "import json; print json.loads('$JSON').get('$PROP')" |
| 359 } | 359 } |
| OLD | NEW |