mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Various minor capitalization and typo fixes (#371)
This commit fixes various minor typos, punctuation errors and corrects the capitalization of many names.
This commit is contained in:
Johnothan King
Martijn Dekker
parent
cd562b16e2
commit
e54001d58b
204 changed files with 779 additions and 784 deletions
|
|
@ -434,7 +434,7 @@ then set -o posix -o trackall
|
|||
set +o posix
|
||||
fi
|
||||
|
||||
# =====
|
||||
# ======
|
||||
# test should support '<' as well as '>'; before 2021-11-13, ksh supported
|
||||
# only '>' due to '<' being missorted in shtab_testops[] in data/testops.c
|
||||
[ foo \< bar ] 2>/dev/null
|
||||
|
|
|
|||
|
|
@ -918,7 +918,7 @@ unset foo
|
|||
[[ $(printf '%(%q)T') == $(printf '%(%Qz)T') ]] && err_exit 'date format %q is the same as %Qz'
|
||||
[[ $(printf '%(%Z)T') == $(date '+%Z') ]] || err_exit "date format %Z is incorrect (expected $(date '+%Z'), got $(printf '%(%Z)T'))"
|
||||
|
||||
# Test manually specified blank and zero padding with 'printf %T'
|
||||
# Test manually specified blank and zero padding with 'printf %T'
|
||||
(
|
||||
IFS=$'\n\t' # Preserve spaces in output
|
||||
for i in d e H I j J k l m M N S U V W y; do
|
||||
|
|
@ -1073,7 +1073,7 @@ then got=$( { "$SHELL" -c '
|
|||
"(got status $e$( ((e>128)) && print -n / && kill -l "$e"), $(printf %q "$got"))"
|
||||
fi
|
||||
|
||||
# ==========
|
||||
# ======
|
||||
# Verify that the POSIX 'test' builtin exits with status 2 when given an invalid binary operator.
|
||||
for operator in '===' ']]'
|
||||
do
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
. "${SHTESTS_COMMON:-${0%/*}/_common}"
|
||||
|
||||
if [[ -d /cygdrive ]]
|
||||
then err_exit cygwin detected - coprocess tests disabled - enable at the risk of wedging your system
|
||||
then err_exit 'Cygwin detected - coprocess tests disabled - enable at the risk of wedging your system'
|
||||
exit $((Errors))
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ cat > $tmp/script <<- \EOF
|
|||
EOF
|
||||
chmod +x $tmp/script
|
||||
if [[ $( $SHELL $tmp/script arg1 arg2) != arg2 ]]
|
||||
then err_exit 'arguments not restored by posix functions'
|
||||
then err_exit 'arguments not restored by POSIX functions'
|
||||
fi
|
||||
function foo
|
||||
{
|
||||
|
|
@ -302,7 +302,7 @@ bad()
|
|||
val=true
|
||||
bad
|
||||
if [[ $val != false ]]
|
||||
then err_exit 'set -e not inherited for posix functions'
|
||||
then err_exit 'set -e not inherited for POSIX functions'
|
||||
fi
|
||||
trap - ERR
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ before=0 after=0 i=0 u=0
|
|||
|
||||
|
||||
# Check results.
|
||||
# The function has 'err_exit' in the name so that shtests counts each call as at test.
|
||||
# The function has 'err_exit' in the name so that shtests counts each call as a test.
|
||||
function err_exit_if_leak
|
||||
{
|
||||
if ((after > before + tolerance))
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ then LC_ALL=debug
|
|||
unset exp LC_ALL
|
||||
fi # SHOPT_MULTIBYTE
|
||||
|
||||
# test shift-jis \x81\x40 ... \x81\x7E encodings
|
||||
# (shift char followed by 7 bit ascii)
|
||||
# test Shift JIS \x81\x40 ... \x81\x7E encodings
|
||||
# (shift char followed by 7 bit ASCII)
|
||||
|
||||
typeset -i16 chr
|
||||
((SHOPT_MULTIBYTE)) && for locale in "${locales[@]}"
|
||||
|
|
@ -106,7 +106,7 @@ if [[ -n $nl_NL ]] && [[ -n $ja_JP ]]; then
|
|||
fi
|
||||
unset LC_ALL
|
||||
|
||||
# this locale is supported by ast on all platforms
|
||||
# this locale is supported by AST on all platforms
|
||||
# EU for { decimal_point="," thousands_sep="." }
|
||||
|
||||
if ((SHOPT_MULTIBYTE)); then
|
||||
|
|
@ -255,10 +255,10 @@ got=$(set +x; LC_ALL=C.UTF-8 $SHELL -c $'\u[5929]=OK; print ${\u[5929]}' 2>&1)
|
|||
got=$(set +x; LC_ALL=C.UTF-8 $SHELL -c $'function \u[5929]\n{\nprint OK;\n}; \u[5929]' 2>&1)
|
||||
[[ $got == "$exp" ]] || err_exit "multibyte ksh function definition/execution failed -- expected '$exp', got '$got'"
|
||||
got=$(set +x; LC_ALL=C.UTF-8 $SHELL -c $'\u[5929]()\n{\nprint OK;\n}; \u[5929]' 2>&1)
|
||||
[[ $got == "$exp" ]] || err_exit "multibyte posix function definition/execution failed -- expected '$exp', got '$got'"
|
||||
[[ $got == "$exp" ]] || err_exit "multibyte POSIX function definition/execution failed -- expected '$exp', got '$got'"
|
||||
fi # SHOPT_MULTIBYTE
|
||||
|
||||
# this locale is supported by ast on all platforms
|
||||
# this locale is supported by AST on all platforms
|
||||
# mainly used to debug multibyte and message translation code
|
||||
# however wctype is not supported but that's ok for these tests
|
||||
|
||||
|
|
|
|||
|
|
@ -478,9 +478,9 @@ done
|
|||
# SIGINFO should be supported by the kill builtin on platforms that have it.
|
||||
if "$(whence -p kill)" -INFO $$ 2> /dev/null
|
||||
then
|
||||
got=$(kill -INFO $$ 2>&1) || err_exit '`kill` cannot send SIGINFO to processes when passed `-INFO`' \
|
||||
got=$(kill -INFO $$ 2>&1) || err_exit "kill builtin cannot send SIGINFO to processes when passed '-INFO'" \
|
||||
"(got $(printf %q "$got"))"
|
||||
got=$(kill -s INFO $$ 2>&1) || err_exit '`kill` cannot send SIGINFO to processes when passed `-s INFO`' \
|
||||
got=$(kill -s INFO $$ 2>&1) || err_exit "kill builtin cannot send SIGINFO to processes when passed '-s INFO'" \
|
||||
"(got $(printf %q "$got"))"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ expected=$'(\n\ttypeset -l -i h=0\n\tbenchcmd_t -a m\n\ttypeset -l -E o=0\n)'
|
|||
expected=$'Std_file_t db.file[/etc/profile]=(action=preserve;typeset -A sum=([8242e663d6f7bb4c5427a0e58e2925f3]=1);)'
|
||||
{
|
||||
got=$($SHELL <<- \EOF
|
||||
MAGIC='stdinstall (at&t research) 2009-08-25'
|
||||
MAGIC='stdinstall (AT&T Research) 2009-08-25'
|
||||
typeset -T Std_file_t=(
|
||||
typeset action
|
||||
typeset -A sum
|
||||
|
|
@ -360,7 +360,7 @@ expected=$'Std_file_t db.file[/etc/profile]=(action=preserve;typeset -A sum=([82
|
|||
typeset magic=$MAGIC
|
||||
Std_file_t -A file
|
||||
)
|
||||
Std_t db=(magic='stdinstall (at&t research) 2009-08-25';Std_file_t -A file=( [/./home/gsf/.env.sh]=(action=preserve;typeset -A sum=([9b67ab407d01a52b3e73e3945b9a3ee0]=1);)[/etc/profile]=(action=preserve;typeset -A sum=([8242e663d6f7bb4c5427a0e58e2925f3]=1);)[/home/gsf/.profile]=(action=preserve;typeset -A sum=([3ce23137335219672bf2865d003a098e]=1);));)
|
||||
Std_t db=(magic='stdinstall (AT&T Research) 2009-08-25';Std_file_t -A file=( [/./home/gsf/.env.sh]=(action=preserve;typeset -A sum=([9b67ab407d01a52b3e73e3945b9a3ee0]=1);)[/etc/profile]=(action=preserve;typeset -A sum=([8242e663d6f7bb4c5427a0e58e2925f3]=1);)[/home/gsf/.profile]=(action=preserve;typeset -A sum=([3ce23137335219672bf2865d003a098e]=1);));)
|
||||
typeset -p db.file[/etc/profile]
|
||||
EOF)
|
||||
} 2> /dev/null
|
||||
|
|
|
|||
|
|
@ -606,14 +606,14 @@ chmod +x $tmp/script
|
|||
. $tmp/script 1
|
||||
[[ $file == $tmp/script ]] || err_exit ".sh.file not working for dot scripts"
|
||||
[[ $($SHELL $tmp/script) == $tmp/script ]] || err_exit ".sh.file not working for scripts"
|
||||
[[ $(posixfun .sh.file) == $tmp/script ]] || err_exit ".sh.file not working for posix functions"
|
||||
[[ $(posixfun .sh.file) == $tmp/script ]] || err_exit ".sh.file not working for POSIX functions"
|
||||
[[ $(fun .sh.file) == $tmp/script ]] || err_exit ".sh.file not working for functions"
|
||||
[[ $(posixfun .sh.fun) == posixfun ]] || err_exit ".sh.fun not working for posix functions"
|
||||
[[ $(posixfun .sh.fun) == posixfun ]] || err_exit ".sh.fun not working for POSIX functions"
|
||||
[[ $(fun .sh.fun) == fun ]] || err_exit ".sh.fun not working for functions"
|
||||
[[ $(posixfun .sh.subshell) == 1 ]] || err_exit ".sh.subshell not working for posix functions"
|
||||
[[ $(posixfun .sh.subshell) == 1 ]] || err_exit ".sh.subshell not working for POSIX functions"
|
||||
[[ $(fun .sh.subshell) == 1 ]] || err_exit ".sh.subshell not working for functions"
|
||||
(
|
||||
[[ $(posixfun .sh.subshell) == 2 ]] || err_exit ".sh.subshell not working for posix functions in subshells"
|
||||
[[ $(posixfun .sh.subshell) == 2 ]] || err_exit ".sh.subshell not working for POSIX functions in subshells"
|
||||
[[ $(fun .sh.subshell) == 2 ]] || err_exit ".sh.subshell not working for functions in subshells"
|
||||
(( .sh.subshell == 1 )) || err_exit ".sh.subshell not working in a subshell"
|
||||
)
|
||||
|
|
@ -700,12 +700,12 @@ exec 2>&3-
|
|||
set -- $x
|
||||
[[ $2 == b ]] || err_exit '$2 should be b after subshell'
|
||||
|
||||
# ======
|
||||
# BUG_KBGPID: $! was not updated under certain conditions
|
||||
: & pid=$!
|
||||
( : & )
|
||||
[[ $pid == $! ]] || err_exit '$! value not preserved across subshells'
|
||||
|
||||
# ======
|
||||
# BUG_KBGPID: $! was not updated under certain conditions
|
||||
pid=$!
|
||||
{ : & } >&2
|
||||
[[ $pid == $! ]] && err_exit '$! value not updated after bg job in braces+redir'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue