OLD | NEW |
1 #!/bin/bash | 1 #!/bin/bash |
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client 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 #@ Untrusted Toolchain Test Helper | 6 #@ Untrusted Toolchain Test Helper |
7 #@------------------------------------------------------------------- | 7 #@------------------------------------------------------------------- |
8 #@ It MUST be run from the native_client/ directory. | 8 #@ It MUST be run from the native_client/ directory. |
9 #@ | 9 #@ |
10 #@ The env variables: UTMAN_CONCURRENCY, UTMAN_BUILDBOT, UTMAN_DEBUG | 10 #@ The env variables: UTMAN_CONCURRENCY, UTMAN_BUILDBOT, UTMAN_DEBUG |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 test-scons-sbtc-common x86-64 "$@" | 221 test-scons-sbtc-common x86-64 "$@" |
222 } | 222 } |
223 | 223 |
224 #@ --- Displayless chrome browser tests (for bots / interruption-free testing). | 224 #@ --- Displayless chrome browser tests (for bots / interruption-free testing). |
225 #@ --- To run a browser test with a display, use plain test-${arch} instead. | 225 #@ --- To run a browser test with a display, use plain test-${arch} instead. |
226 | 226 |
227 # These call out to the other buildbot test script. We should have | 227 # These call out to the other buildbot test script. We should have |
228 # buildbot_toolchain_arm_untrusted.sh use the same tests directly. | 228 # buildbot_toolchain_arm_untrusted.sh use the same tests directly. |
229 # TODO(jvoung): remove these when unified. | 229 # TODO(jvoung): remove these when unified. |
230 | 230 |
| 231 # scons browser-tests are currently broken with concurrency, so use -j1 |
| 232 # BUG= http://code.google.com/p/nativeclient/issues/detail?id=2019 |
| 233 |
231 #@ test-arm-browser - run arm browser tests via pnacl toolchain. | 234 #@ test-arm-browser - run arm browser tests via pnacl toolchain. |
232 test-arm-browser() { | 235 test-arm-browser() { |
233 ${OTHER_TEST_SCRIPT} browser-tests "arm" \ | 236 ${OTHER_TEST_SCRIPT} browser-tests "arm" \ |
234 "--mode=opt-host,nacl -j${UTMAN_CONCURRENCY}" | 237 "--mode=opt-host,nacl -j1" |
235 } | 238 } |
236 | 239 |
237 #@ test-x86-32-browser - run x86-32 browser tests via pnacl toolchain. | 240 #@ test-x86-32-browser - run x86-32 browser tests via pnacl toolchain. |
238 test-x86-32-browser() { | 241 test-x86-32-browser() { |
239 ${OTHER_TEST_SCRIPT} browser-tests "x86-32" \ | 242 ${OTHER_TEST_SCRIPT} browser-tests "x86-32" \ |
240 "--mode=opt-host,nacl -j${UTMAN_CONCURRENCY}" | 243 "--mode=opt-host,nacl -j1" |
241 } | 244 } |
242 | 245 |
243 #@ test-x86-64-browser - run all x86-64 browser tests via pnacl toolchain. | 246 #@ test-x86-64-browser - run all x86-64 browser tests via pnacl toolchain. |
244 test-x86-64-browser() { | 247 test-x86-64-browser() { |
245 ${OTHER_TEST_SCRIPT} browser-tests "x86-64" \ | 248 ${OTHER_TEST_SCRIPT} browser-tests "x86-64" \ |
246 "--mode=opt-host,nacl -j${UTMAN_CONCURRENCY}" | 249 "--mode=opt-host,nacl -j1" |
247 } | 250 } |
248 | 251 |
249 #@ test-all - run arm, x86-32, and x86-64 tests. (all should pass) | 252 #@ test-all - run arm, x86-32, and x86-64 tests. (all should pass) |
250 test-all() { | 253 test-all() { |
251 if [ $# -ne 0 ]; then | 254 if [ $# -ne 0 ]; then |
252 echo "test-all does not take any arguments" | 255 echo "test-all does not take any arguments" |
253 exit -1 | 256 exit -1 |
254 fi | 257 fi |
255 | 258 |
256 ${OTHER_TEST_SCRIPT} mode-test-all-fast ${UTMAN_CONCURRENCY} | 259 ${OTHER_TEST_SCRIPT} mode-test-all-fast ${UTMAN_CONCURRENCY} |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 [ $# = 0 ] && set -- help # Avoid reference to undefined $1. | 365 [ $# = 0 ] && set -- help # Avoid reference to undefined $1. |
363 if [ "$(type -t $1)" != "function" ]; then | 366 if [ "$(type -t $1)" != "function" ]; then |
364 #Usage | 367 #Usage |
365 echo "ERROR: unknown function '$1'." >&2 | 368 echo "ERROR: unknown function '$1'." >&2 |
366 echo "For help, try:" | 369 echo "For help, try:" |
367 echo " $0 help" | 370 echo " $0 help" |
368 exit 1 | 371 exit 1 |
369 fi | 372 fi |
370 | 373 |
371 "$@" | 374 "$@" |
OLD | NEW |