[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-349-ga0834d3

[Igor Murzov]

The following commit has been merged in the master branch:
commit 243abdcdd3e27c83bdc8c0ec866e4209112be029
Author: Igor Murzov <e-mail at date.by>
Date:   Sun Jun 5 01:34:21 2011 +0400

    testsuite: Remove/use set but unused variable "test"

diff --git a/test/lib/completions/c++.exp b/test/lib/completions/c++.exp
index 4dffb04..c899de2 100644
--- a/test/lib/completions/c++.exp
+++ b/test/lib/completions/c++.exp
@@ -11,7 +11,6 @@ proc teardown {} {
 setup
 
 
-set test "Tab should complete"
 assert_complete_any "c++ "
 
 
diff --git a/test/lib/completions/find.exp b/test/lib/completions/find.exp
index 9acda64..96d5533 100644
--- a/test/lib/completions/find.exp
+++ b/test/lib/completions/find.exp
@@ -43,7 +43,7 @@ sync_after_int
 set test "-wholename should complete files/dirs"
 set dir $::srcdir/fixtures/shared/default
 set files [split [exec bash -c "cd $dir && ls -p"] "\n"]
-assert_complete_dir $files "find -wholename " $dir
+assert_complete_dir $files "find -wholename " $dir $test
 
 
 sync_after_int
diff --git a/test/lib/completions/finger.exp b/test/lib/completions/finger.exp
index 70e3ed2..026d07e 100644
--- a/test/lib/completions/finger.exp
+++ b/test/lib/completions/finger.exp
@@ -24,7 +24,7 @@ sync_after_int
 
 
 set test "Tab should complete partial username"
-assert_complete_partial [exec bash -c "compgen -A user"] "finger" -nospace
+assert_complete_partial [exec bash -c "compgen -A user"] "finger" "" $test -nospace
 
 
 sync_after_int
diff --git a/test/lib/completions/mutt.exp b/test/lib/completions/mutt.exp
index 8ee4069..1f4425e 100644
--- a/test/lib/completions/mutt.exp
+++ b/test/lib/completions/mutt.exp
@@ -24,12 +24,12 @@ sync_after_int
 
 set test "mutt should complete mailboxes" 
 set expected {foo/ bar/ muttrc}
-assert_complete_dir $expected "mutt -F muttrc -f =" $::srcdir/fixtures/mutt
+assert_complete_dir $expected "mutt -F muttrc -f =" $::srcdir/fixtures/mutt $test
 
 
 set test "mutt should complete aliases" 
 set expected {a1 a2}
-assert_complete_dir $expected "mutt -F muttrc -A " $::srcdir/fixtures/mutt
+assert_complete_dir $expected "mutt -F muttrc -A " $::srcdir/fixtures/mutt $test
 
 
 sync_after_int
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 8cd6f95..f3a5184 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -86,7 +86,7 @@ set test "- should complete options"
 set options {
     -0 -a -c -C -d -D -e -F -h -i -I -l -m -M -n -p -P -s -S -T -u -U -v -V -w -W -x -X
 }
-assert_complete $options "perl -"
+assert_complete $options "perl -" $test
 
 
 sync_after_int
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index dc1c79c..9a9d9fb 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -32,7 +32,7 @@ set test "- should complete options"
 set options {
     -h -v -t -u -m -l -F -X -f -q
 }
-assert_complete $options "perldoc -"
+assert_complete $options "perldoc -" $test
 
 
 sync_after_int
diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index c436184..7cc6eb0 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -24,7 +24,7 @@ set host bash_completion
 
     # Retrieving home directory (host_pwd) from ssh-host `bash_completion'
     # yields error? 
-if { 
+if {
     [catch {
 	exec -- ssh -o "Batchmode yes" -o "ConnectTimeout 1" $host pwd 2>> /dev/null
     } host_pwd] 
@@ -64,7 +64,7 @@ foreach host [get_hosts] {
 lappend expected blah: doo: gee: hus: ike:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
-assert_complete $expected "scp -F config "
+assert_complete $expected "scp -F config " $test
 
 
 sync_after_int
diff --git a/test/lib/completions/xhost.exp b/test/lib/completions/xhost.exp
index 82e2e9c..8aa65b9 100644
--- a/test/lib/completions/xhost.exp
+++ b/test/lib/completions/xhost.exp
@@ -58,7 +58,7 @@ foreach h [get_hosts] {
         lappend hosts "+$h"
     }
 }
-assert_complete $hosts "xhost +$char"
+assert_complete $hosts "xhost +$char" $test
 
 
 sync_after_int
diff --git a/test/lib/completions/xvnc4viewer.exp b/test/lib/completions/xvnc4viewer.exp
index b10e272..6432ed2 100644
--- a/test/lib/completions/xvnc4viewer.exp
+++ b/test/lib/completions/xvnc4viewer.exp
@@ -22,7 +22,7 @@ set options {
     -via -ViewOnly -WMDecorationHeight -WMDecorationWidth
     -ZlibLevel
 }
-assert_complete $options {vncviewer -}
+assert_complete $options {vncviewer -} $test
 
 
 sync_after_int

-- 
bash-completion