1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 11:42:21 +00:00

Fix a few regression test failures (#222)

src/cmd/ksh93/tests/_common:
- Commit aed5c6d7 renamed the err_exit function,
  breaking a few tests in glob.sh that call the function
  directly instead of using the alias. Restore the function.

src/cmd/ksh93/tests/builtins.sh:
- The dtksh builtins don't have optget option parsing, so
  skip the unrecognized options test for those (this of
  course only has relevance when running dtksh against the
  regression tests).

src/cmd/ksh93/tests/pty.sh:
- If the vi editor couldn't be found on the $PATH, skip the
  regression test that involves it.
This commit is contained in:
Johnothan King 2021-03-14 14:32:04 -07:00 committed by GitHub
parent 51df036f26
commit ef4fe4106c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View file

@ -19,7 +19,12 @@ _message()
{
print -r $'\t'"${Command}[$1]: ${@:2}" >&2
}
alias err_exit='_message "$((Errors++,LINENO))"' # inaccurate err_exit name kept for historical integrity :)
function err_exit
{
_message "$@"
let Errors+=1
}
alias err_exit='err_exit $LINENO' # inaccurate err_exit name kept for historical integrity :)
alias warning='_message "$LINENO" "warning:"'
Command=${0##*/}

View file

@ -963,7 +963,7 @@ EOF
# Builtins should handle unrecognized options correctly
while IFS= read -r bltin <&3
do case $bltin in
echo | test | true | false | \[ | : | getconf | */getconf | uname | */uname | login | newgrp)
echo | test | true | false | \[ | : | getconf | */getconf | uname | */uname | Dt* | X* | login | newgrp )
continue ;;
/*/*) expect="Usage: ${bltin##*/} "
actual=$({ PATH=${bltin%/*}; "${bltin##*/}" --this-option-does-not-exist; } 2>&1) ;;

View file

@ -391,7 +391,7 @@ r history
fi
# err_exit #
((SHOPT_VSH)) && tst $LINENO <<"!"
((SHOPT_VSH)) && whence -q vi && tst $LINENO <<"!"
L POSIX sh 137(C)
# If the User Portability Utilities Option is supported and shell