| 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 local EXTRA_FLAGS=${2} | 214 local EXTRA_FLAGS=${2} |
| 215 local INSTRUMENTATION_FLAGS="-vvv" | 215 local INSTRUMENTATION_FLAGS="-vvv" |
| 216 INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}" | 216 INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}" |
| 217 INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}" | 217 INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}" |
| 218 build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS} | 218 build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS} |
| 219 } | 219 } |
| 220 | 220 |
| 221 # Run content shell instrumentation test on device. | 221 # Run content shell instrumentation test on device. |
| 222 function bb_run_instrumentation_tests { | 222 function bb_run_instrumentation_tests { |
| 223 build/android/adb_install_content_shell | 223 build/android/adb_install_content_shell |
| 224 local TEST_APK="content_shell_test/ContentShellTest-debug" | 224 local TEST_APK="ContentShellTest" |
| 225 # Use -I to install the test apk only on the first run. | 225 # Use -I to install the test apk only on the first run. |
| 226 # TODO(bulach): remove the second once we have a Smoke test. | 226 # TODO(bulach): remove the second once we have a Smoke test. |
| 227 bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke" | 227 bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke" |
| 228 bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest" | 228 bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest" |
| 229 bb_run_instrumentation_test ${TEST_APK} "-A MediumTest" | 229 bb_run_instrumentation_test ${TEST_APK} "-A MediumTest" |
| 230 bb_run_instrumentation_test ${TEST_APK} "-A LargeTest" | 230 bb_run_instrumentation_test ${TEST_APK} "-A LargeTest" |
| 231 } | 231 } |
| 232 | 232 |
| 233 # Zip and archive a build. | 233 # Zip and archive a build. |
| 234 function bb_zip_build { | 234 function bb_zip_build { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 ) | 298 ) |
| 299 } | 299 } |
| 300 | 300 |
| 301 # Retrieve a packed json property using python | 301 # Retrieve a packed json property using python |
| 302 function bb_get_json_prop { | 302 function bb_get_json_prop { |
| 303 local JSON="$1" | 303 local JSON="$1" |
| 304 local PROP="$2" | 304 local PROP="$2" |
| 305 | 305 |
| 306 python -c "import json; print json.loads('$JSON').get('$PROP')" | 306 python -c "import json; print json.loads('$JSON').get('$PROP')" |
| 307 } | 307 } |
| OLD | NEW |