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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 python build/android/adb_logcat_printer.py "$LOGCAT_DUMP_DIR" | 203 python build/android/adb_logcat_printer.py "$LOGCAT_DUMP_DIR" |
204 } | 204 } |
205 | 205 |
206 # Run tests on an actual device. (Better have one plugged in!) | 206 # Run tests on an actual device. (Better have one plugged in!) |
207 function bb_run_unit_tests { | 207 function bb_run_unit_tests { |
208 build/android/run_tests.py --xvfb --verbose | 208 build/android/run_tests.py --xvfb --verbose |
209 } | 209 } |
210 | 210 |
211 # Run experimental unittest bundles. | 211 # Run experimental unittest bundles. |
212 function bb_run_experimental_unit_tests { | 212 function bb_run_experimental_unit_tests { |
213 build/android/run_tests.py --xvfb --verbose -s \ | 213 # This build step was added because bash does not allow empty functions. |
214 webkit_compositor_bindings_unittests | 214 # run_tests.py echoes a build step, comment/remove this build step when you |
| 215 # add tests to the experimental step. |
| 216 echo '@@@BUILD_STEP experimental_unit_tests@@@' |
| 217 |
215 } | 218 } |
216 | 219 |
217 # Run a buildbot step and handle failure. | 220 # Run a buildbot step and handle failure. |
218 function bb_run_step { | 221 function bb_run_step { |
219 ( | 222 ( |
220 set +e | 223 set +e |
221 "$@" | 224 "$@" |
222 if [[ $? != 0 ]]; then | 225 if [[ $? != 0 ]]; then |
223 echo "@@@STEP_FAILURE@@@" | 226 echo "@@@STEP_FAILURE@@@" |
224 fi | 227 fi |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 ) | 324 ) |
322 } | 325 } |
323 | 326 |
324 # Retrieve a packed json property using python | 327 # Retrieve a packed json property using python |
325 function bb_get_json_prop { | 328 function bb_get_json_prop { |
326 local JSON="$1" | 329 local JSON="$1" |
327 local PROP="$2" | 330 local PROP="$2" |
328 | 331 |
329 python -c "import json; print json.loads('$JSON').get('$PROP', '')" | 332 python -c "import json; print json.loads('$JSON').get('$PROP', '')" |
330 } | 333 } |
OLD | NEW |