1be84710d2
This fixes a bug under bash-4 where completing:
scp -F 'spaced conf' <TAB>
causes `dequote' to yield errors:
bash: eval: line 1: unexpected EOF while looking for matching `''
bash: eval: line 2: syntax error: unexpected end of file
The bug occurs because of a bug in bash-4.0, where quoted words are split
unintended, see: http://www.mail-archive.com/bug-bash@gnu.org/msg06095.html
Workaround is now to silence `dequote' in case of errors and wait for bash-4 to
be fixed...
78 lines
1.8 KiB
Plaintext
78 lines
1.8 KiB
Plaintext
proc setup {} {
|
|
save_env
|
|
}; # setup()
|
|
|
|
|
|
proc teardown {} {
|
|
assert_env_unmodified {
|
|
/BASH_LINENO=/d
|
|
/BASH_SOURCE=/d
|
|
/OLDPWD=/d
|
|
}
|
|
}; # teardown()
|
|
|
|
|
|
setup
|
|
|
|
|
|
# Build string list of expected completions
|
|
set expected [get_hosts]
|
|
# Hosts `gee' and `hus' are defined in ./fixtures/sftp/config
|
|
# Hosts `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
|
|
lappend expected doo gee hus ike
|
|
set dir fixtures/scp
|
|
assert_complete_dir $expected "sftp -F config " $dir
|
|
|
|
|
|
sync_after_int
|
|
|
|
|
|
set test "-F without space shouldn't error"
|
|
# Try completion
|
|
set cmd "sftp -F"
|
|
send "$cmd\t "
|
|
expect {
|
|
-re "^${cmd}bash: option requires an argument -- F" { fail "$test" }
|
|
-re "^$cmd\r\n.*\r\n/@" { pass "$test" }
|
|
-re /@ { unresolved "$test at prompt" }
|
|
default { unresolved "$test" }
|
|
}; # expect
|
|
|
|
|
|
sync_after_int
|
|
|
|
|
|
# Build string list of expected completions
|
|
# Get hostnames and give them a colon (:) suffix
|
|
set expected [get_hosts]
|
|
# Hosts `gee', `hus' and `jar' are defined in "./fixtures/scp/spaced conf"
|
|
# Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
|
|
lappend expected doo gee hus ike jar
|
|
set dir fixtures/sftp
|
|
assert_complete_dir $expected "sftp -F spaced\\ \\ conf " $dir
|
|
|
|
|
|
sync_after_int
|
|
|
|
|
|
set test "-F should complete filename"
|
|
set dir fixtures/sftp
|
|
set prompt "/$dir/@"
|
|
assert_bash_exec "cd $dir" "" $prompt
|
|
set cmd "ssh -Fsp"
|
|
send "$cmd\t"
|
|
expect -ex "$cmd"
|
|
expect {
|
|
-ex "aced\\ \\ conf" { pass "$test" }
|
|
# _filedir works only if `-o filenames' is in effect, which isn't the
|
|
# case for `sftp'
|
|
-re "aced conf" { xfail "$test" }
|
|
-re $prompt { unresolved "$test at prompt" }
|
|
default { unresolved "$test" }
|
|
}; # expect
|
|
sync_after_int $prompt
|
|
assert_bash_exec "cd \$TESTDIR"
|
|
|
|
|
|
teardown
|