Imported from ../bash-4.0-rc1.tar.gz.

[platform/upstream/bash.git] / tests / errors.right

diff --git a/tests/errors.right b/tests/errors.right
index e2e8ad0..ae7bf29 100644 (file)
--- a/tests/errors.right
+++ b/tests/errors.right
@@ -1,7 +1,7 @@
 ./errors.tests: line 17: alias: -x: invalid option
 alias: usage: alias [-p] [name[=value] ... ]
 ./errors.tests: line 18: unalias: -x: invalid option
-unalias: usage: unalias [-a] [name ...]
+unalias: usage: unalias [-a] name [name ...]
 ./errors.tests: line 19: alias: hoowah: not found
 ./errors.tests: line 20: unalias: hoowah: not found
 ./errors.tests: line 23: `1': not a valid identifier
@@ -15,12 +15,12 @@ unset: usage: unset [-f] [-v] [name ...]
 ./errors.tests: line 52: unset: `/bin/sh': not a valid identifier
 ./errors.tests: line 55: unset: cannot simultaneously unset a function and a variable
 ./errors.tests: line 58: declare: -z: invalid option
-declare: usage: declare [-afFirtx] [-p] name[=value] ...
+declare: usage: declare [-aAfFilrtux] [-p] [name[=value] ...]
 ./errors.tests: line 60: declare: `-z': not a valid identifier
 ./errors.tests: line 61: declare: `/bin/sh': not a valid identifier
 ./errors.tests: line 65: declare: cannot use `-f' to make functions
 ./errors.tests: line 68: exec: -i: invalid option
-exec: usage: exec [-cl] [-a name] file [redirection ...]
+exec: usage: exec [-cl] [-a name] [command [arguments ...]] [redirection ...]
 ./errors.tests: line 72: export: XPATH: not a function
 ./errors.tests: line 75: break: only meaningful in a `for', `while', or `until' loop
 ./errors.tests: line 76: continue: only meaningful in a `for', `while', or `until' loop
@@ -53,22 +53,23 @@ umask: usage: umask [-p] [-S] [mode]
 ./errors.tests: line 159: declare: VAR: readonly variable
 ./errors.tests: line 161: declare: unset: not found
 ./errors.tests: line 164: VAR: readonly variable
-./errors.tests: command substitution: line 2: syntax error: unexpected end of file
-./errors.tests: command substitution: line 1: syntax error near unexpected token `done'
-./errors.tests: command substitution: line 1: ` for z in 1 2 3; done '
+./errors.tests: command substitution: line 168: syntax error near unexpected token `)'
+./errors.tests: command substitution: line 168: ` for z in 1 2 3; do )'
+./errors.tests: command substitution: line 169: syntax error near unexpected token `done'
+./errors.tests: command substitution: line 169: ` for z in 1 2 3; done )'
 ./errors.tests: line 171: cd: HOME not set
 ./errors.tests: line 172: cd: /tmp/xyz.bash: No such file or directory
 ./errors.tests: line 174: cd: OLDPWD not set
 ./errors.tests: line 175: cd: /bin/sh: Not a directory
 ./errors.tests: line 177: cd: /tmp/cd-notthere: No such file or directory
 ./errors.tests: line 180: .: filename argument required
-.: usage: . filename
+.: usage: . filename [arguments]
 ./errors.tests: line 181: source: filename argument required
-source: usage: source filename
+source: usage: source filename [arguments]
 ./errors.tests: line 184: .: -i: invalid option
-.: usage: . filename
+.: usage: . filename [arguments]
 ./errors.tests: line 187: set: -q: invalid option
-set: usage: set [--abefhkmnptuvxBCHP] [-o option] [arg ...]
+set: usage: set [--abefhkmnptuvxBCHP] [-o option-name] [arg ...]
 ./errors.tests: line 190: enable: sh: not a shell builtin
 ./errors.tests: line 190: enable: bash: not a shell builtin
 ./errors.tests: line 193: shopt: cannot set and unset shell options simultaneously
@@ -76,16 +77,16 @@ set: usage: set [--abefhkmnptuvxBCHP] [-o option] [arg ...]
 ./errors.tests: line 199: read: `/bin/sh': not a valid identifier
 ./errors.tests: line 202: VAR: readonly variable
 ./errors.tests: line 205: readonly: -x: invalid option
-readonly: usage: readonly [-anf] [name[=value] ...] or readonly -p
+readonly: usage: readonly [-af] [name[=value] ...] or readonly -p
 ./errors.tests: line 208: eval: -i: invalid option
 eval: usage: eval [arg ...]
 ./errors.tests: line 209: command: -i: invalid option
 command: usage: command [-pVv] command [arg ...]
-./errors.tests: line 1: /bin/sh + 0: syntax error: operand expected (error token is "/bin/sh + 0")
-./errors.tests: line 1: /bin/sh + 0: syntax error: operand expected (error token is "/bin/sh + 0")
+./errors.tests: line 212: /bin/sh + 0: syntax error: operand expected (error token is "/bin/sh + 0")
+./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 [arg] [signal_spec ...] or trap -l
+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
@@ -95,6 +96,6 @@ trap: usage: trap [arg] [signal_spec ...] or trap -l
 ./errors.tests: line 246: kill: -s: option requires an argument
 ./errors.tests: line 248: kill: S: invalid signal specification
 ./errors.tests: line 250: kill: `': not a pid or valid job spec
-kill: usage: kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
+kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
 ./errors.tests: line 255: set: trackall: invalid option name
 ./errors.tests: line 262: `!!': not a valid identifier