diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2004-11-09 21:37:25 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:57 +0000 |
| commit | eb87367179effbe5f430236db8259006d71438b7 (patch) | |
| tree | 012cd9de789fea49510f8e25118acf2be9bfa2ed /tests | |
| parent | b80f6443b6b7b620c7272664c66ecb0b120a0998 (diff) | |
| download | android_external_bash-eb87367179effbe5f430236db8259006d71438b7.tar.gz android_external_bash-eb87367179effbe5f430236db8259006d71438b7.tar.bz2 android_external_bash-eb87367179effbe5f430236db8259006d71438b7.zip | |
Imported from ../bash-3.0.16.tar.gz.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/array.right | 4 | ||||
| -rw-r--r-- | tests/array.tests | 2 | ||||
| -rwxr-xr-x | tests/dbg-support.tests | 4 | ||||
| -rw-r--r-- | tests/errors.right | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/array.right b/tests/array.right index f0c456e..fa2ae2a 100644 --- a/tests/array.right +++ b/tests/array.right @@ -170,8 +170,8 @@ too many elements -- expect three five seven three five seven positive offset - expect five seven five seven -negative offset - expect five seven -five seven +negative offset to unset element - expect seven +seven positive offset 2 - expect seven seven negative offset 2 - expect seven diff --git a/tests/array.tests b/tests/array.tests index db02c89..4f5d830 100644 --- a/tests/array.tests +++ b/tests/array.tests @@ -322,7 +322,7 @@ echo ${av[@]:3:5} # how about too many elements? echo positive offset - expect five seven echo ${av[@]:5:2} -echo negative offset - expect five seven +echo negative offset to unset element - expect seven echo ${av[@]: -2:2} echo positive offset 2 - expect seven diff --git a/tests/dbg-support.tests b/tests/dbg-support.tests index 27825d6..3a5e4ae 100755 --- a/tests/dbg-support.tests +++ b/tests/dbg-support.tests @@ -62,8 +62,8 @@ set -o functrace trap 'print_debug_trap $LINENO' DEBUG trap 'print_return_trap $LINENO' RETURN -# Funcname is now an array. Vanilla Bash 2.05 doesn't have FUNCNAME array. -echo "FUNCNAME" ${FUNCNAME[0]} +# Funcname is now an array, but you still can't see it outside a function +echo "FUNCNAME" ${FUNCNAME[0]:-main} # We should trace into the below. # Start easy with a simple function. diff --git a/tests/errors.right b/tests/errors.right index 1f3487b..9d8e185 100644 --- a/tests/errors.right +++ b/tests/errors.right @@ -85,7 +85,7 @@ command: usage: command [-pVv] command [arg ...] ./errors.tests: line 213: /bin/sh + 0: syntax error: operand expected (error token is "/bin/sh + 0") ./errors.tests: line 216: trap: NOSIG: invalid signal specification ./errors.tests: line 219: trap: -s: invalid option -trap: usage: trap [-lp] [[arg] signal_spec ...] +trap: usage: trap [-lp] [arg signal_spec ...] ./errors.tests: line 225: return: can only `return' from a function or sourced script ./errors.tests: line 229: break: 0: loop count out of range ./errors.tests: line 233: continue: 0: loop count out of range |