csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tests when BASH_COMPLETION or TESTDIR contain spaces.

Browse Source
This commit is contained in:
Crestez Dan Leonard 2010-02-02 11:16:29 +02:00
parent 61f83856fb
commit c3bb4416d7
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -68,6 +68,7 @@ bash-completion (2.x)
* Improve ssh -o suboption completion (Alioth: #312122). * Improve ssh -o suboption completion (Alioth: #312122).
* Fix NFS mounts completion (Alioth: #312285). * Fix NFS mounts completion (Alioth: #312285).
* Fix completion of usernames (Alioth: #311396, Debian: #511788). * Fix completion of usernames (Alioth: #311396, Debian: #511788).
* Fixed tests when BASH_COMPLETION or TESTDIR contain spaces.
[ Raphaël Droz ] [ Raphaël Droz ]
* Add xsltproc completion (Alioth: #311843). * Add xsltproc completion (Alioth: #311843).

12
bash_completion
View File

@ -1674,7 +1674,7 @@ _filedir_xspec()
# get first exclusion compspec that matches this command # get first exclusion compspec that matches this command
xspec=$( awk "/^complete[ \t]+.*[ \t]${1##*/}([ \t]|\$)/ { print \$0; exit }" \ xspec=$( awk "/^complete[ \t]+.*[ \t]${1##*/}([ \t]|\$)/ { print \$0; exit }" \
$BASH_COMPLETION ) "$BASH_COMPLETION" )
# prune to leave nothing but the -X spec # prune to leave nothing but the -X spec
xspec=${xspec#*-X } xspec=${xspec#*-X }
xspec=${xspec%% *} xspec=${xspec%% *}
@ -1701,7 +1701,7 @@ _filedir_xspec()
COMPREPLY=( "${toks[@]}" ) COMPREPLY=( "${toks[@]}" )
} }
list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' $BASH_COMPLETION | \ list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' "$BASH_COMPLETION" | \
# read exclusion compspecs # read exclusion compspecs
( (
while read line while read line
@ -1727,19 +1727,19 @@ unset list
# source completion directory definitions # source completion directory definitions
if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
-x $BASH_COMPLETION_COMPAT_DIR ]]; then -x $BASH_COMPLETION_COMPAT_DIR ]]; then
for i in $(LC_ALL=C command ls $BASH_COMPLETION_COMPAT_DIR); do for i in $(LC_ALL=C command ls "$BASH_COMPLETION_COMPAT_DIR"); do
i=$BASH_COMPLETION_COMPAT_DIR/$i i=$BASH_COMPLETION_COMPAT_DIR/$i
[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) \ [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) \
&& ( -f $i || -h $i ) && -r $i ]] && . $i && ( -f $i || -h $i ) && -r $i ]] && . "$i"
done done
fi fi
if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \ if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
-d $BASH_COMPLETION_DIR && -r $BASH_COMPLETION_DIR && \ -d $BASH_COMPLETION_DIR && -r $BASH_COMPLETION_DIR && \
-x $BASH_COMPLETION_DIR ]]; then -x $BASH_COMPLETION_DIR ]]; then
for i in $(LC_ALL=C command ls $BASH_COMPLETION_DIR); do for i in $(LC_ALL=C command ls "$BASH_COMPLETION_DIR"); do
i=$BASH_COMPLETION_DIR/$i i=$BASH_COMPLETION_DIR/$i
[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) \ [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) \
&& ( -f $i || -h $i ) && -r $i ]] && . $i && ( -f $i || -h $i ) && -r $i ]] && . "$i"
done done
fi fi
unset i unset i

2
test/lib/completions/scp.exp
View File

@ -112,7 +112,7 @@ if {[match_items [lsort -unique $expected] $test]} {
if {[lindex $::BASH_VERSINFO 0] >= 4} {xfail "$test"} {fail "$test"} if {[lindex $::BASH_VERSINFO 0] >= 4} {xfail "$test"} {fail "$test"}
}; # if }; # if
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
sync_after_int sync_after_int

2
test/lib/completions/screen.exp
View File

@ -42,7 +42,7 @@ expect {
default { unresolved "$test" } default { unresolved "$test" }
}; # expect }; # expect
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}

2
test/lib/completions/sftp.exp
View File

@ -71,7 +71,7 @@ expect {
default { unresolved "$test" } default { unresolved "$test" }
}; # expect }; # expect
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
teardown teardown

4
test/lib/completions/ssh.exp
View File

@ -29,7 +29,7 @@ expect {
default { unresolved "$test" } default { unresolved "$test" }
}; # expect }; # expect
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
sync_after_int sync_after_int
@ -97,7 +97,7 @@ expect {
default { unresolved "$test" } default { unresolved "$test" }
}; # expect }; # expect
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
sync_after_int sync_after_int

12
test/lib/library.exp
View File

@ -98,7 +98,7 @@ proc assert_bash_list_dir {expected cmd dir {test ""} {prompt /@} {size 20}} {
assert_bash_exec "cd $dir" "" $prompt assert_bash_exec "cd $dir" "" $prompt
assert_bash_list $expected $cmd $test $prompt $size assert_bash_list $expected $cmd $test $prompt $size
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
}; # assert_bash_list_dir() }; # assert_bash_list_dir()
@ -268,7 +268,7 @@ proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
assert_bash_exec "cd $dir" "" $prompt assert_bash_exec "cd $dir" "" $prompt
assert_complete $expected $cmd $test $prompt $size $cword assert_complete $expected $cmd $test $prompt $size $cword
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
}; # assert_complete_dir }; # assert_complete_dir
@ -631,16 +631,16 @@ proc save_env {{file ""}} {
# @param string File to save the environment to. Default is "$TESTDIR/tmp/env1~". # @param string File to save the environment to. Default is "$TESTDIR/tmp/env1~".
# @see assert_env_unmodified() # @see assert_env_unmodified()
proc _save_env {{file ""}} { proc _save_env {{file ""}} {
assert_bash_exec "{ set; declare -F; shopt -p; } > $file" assert_bash_exec "{ set; declare -F; shopt -p; } > \"$file\""
}; # _save_env() }; # _save_env()
# Source bash_completion package # Source bash_completion package
proc source_bash_completion {} { proc source_bash_completion {} {
assert_bash_exec {BASH_COMPLETION_DIR=$(cd $TESTDIR/..; pwd)/contrib} assert_bash_exec {BASH_COMPLETION_DIR=$(cd "$TESTDIR/.."; pwd)/contrib}
assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR} assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
assert_bash_exec {BASH_COMPLETION=$(cd $TESTDIR/..; pwd)/bash_completion} assert_bash_exec {BASH_COMPLETION=$(cd "$TESTDIR/.."; pwd)/bash_completion}
assert_bash_exec {source $BASH_COMPLETION} assert_bash_exec {source "$BASH_COMPLETION"}
}; # source_bash_completion() }; # source_bash_completion()

2
test/unit/compgen.exp
View File

@ -41,7 +41,7 @@ expect {
-re eof { unresolved "eof" } -re eof { unresolved "eof" }
}; # expect }; # expect
sync_after_int $prompt sync_after_int $prompt
assert_bash_exec "cd \$TESTDIR" assert_bash_exec {cd "$TESTDIR"}
#assert_bash_list_dir {a\\\'b/c} $cmd fixtures/compgen #assert_bash_list_dir {a\\\'b/c} $cmd fixtures/compgen