[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 881bce9618e0189b5ab34b8de3eb2c8dd67d1381
Freddy Vulto
fvulto at gmail.com
Sun Jun 14 14:22:32 UTC 2009
The following commit has been merged in the master branch:
commit 881bce9618e0189b5ab34b8de3eb2c8dd67d1381
Author: Freddy Vulto <fvulto at gmail.com>
Date: Sun Jun 14 16:22:25 2009 +0200
Reviewed tests b* & c*
diff --git a/test/_completion_to_review/bc.exp b/test/_completion_to_review/bc.exp
deleted file mode 100644
index 69b21af..0000000
--- a/test/_completion_to_review/bc.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/bc.exp"
diff --git a/test/_completion_to_review/bison.exp b/test/_completion_to_review/bison.exp
deleted file mode 100644
index 159f50c..0000000
--- a/test/_completion_to_review/bison.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/bison.exp"
diff --git a/test/_completion_to_review/cancel.exp b/test/_completion_to_review/cancel.exp
deleted file mode 100644
index 2e339cf..0000000
--- a/test/_completion_to_review/cancel.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/cancel.exp"
diff --git a/test/_completion_to_review/bash.exp b/test/completion/bash.exp
similarity index 100%
rename from test/_completion_to_review/bash.exp
rename to test/completion/bash.exp
diff --git a/test/completion/bc.exp b/test/completion/bc.exp
new file mode 100644
index 0000000..c177a5b
--- /dev/null
+++ b/test/completion/bc.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {bc}]} {
+ source "lib/completions/bc.exp"
+}; # if
diff --git a/test/completion/bison.exp b/test/completion/bison.exp
new file mode 100644
index 0000000..f9b3756
--- /dev/null
+++ b/test/completion/bison.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {bison}]} {
+ source "lib/completions/bison.exp"
+}; # if
diff --git a/test/_completion_to_review/bk.exp b/test/completion/bk.exp
similarity index 100%
rename from test/_completion_to_review/bk.exp
rename to test/completion/bk.exp
diff --git a/test/_completion_to_review/btdownloadcurses.py.exp b/test/completion/btdownloadcurses.py.exp
similarity index 100%
rename from test/_completion_to_review/btdownloadcurses.py.exp
rename to test/completion/btdownloadcurses.py.exp
diff --git a/test/_completion_to_review/btdownloadgui.py.exp b/test/completion/btdownloadgui.py.exp
similarity index 100%
rename from test/_completion_to_review/btdownloadgui.py.exp
rename to test/completion/btdownloadgui.py.exp
diff --git a/test/_completion_to_review/btdownloadheadless.py.exp b/test/completion/btdownloadheadless.py.exp
similarity index 100%
rename from test/_completion_to_review/btdownloadheadless.py.exp
rename to test/completion/btdownloadheadless.py.exp
diff --git a/test/_completion_to_review/c++.exp b/test/completion/c++.exp
similarity index 100%
rename from test/_completion_to_review/c++.exp
rename to test/completion/c++.exp
diff --git a/test/completion/cancel.exp b/test/completion/cancel.exp
new file mode 100644
index 0000000..b97e25f
--- /dev/null
+++ b/test/completion/cancel.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {cancel}]} {
+ source "lib/completions/cancel.exp"
+}; # if
diff --git a/test/_completion_to_review/cardctl.exp b/test/completion/cardctl.exp
similarity index 100%
rename from test/_completion_to_review/cardctl.exp
rename to test/completion/cardctl.exp
diff --git a/test/_completion_to_review/cat.exp b/test/completion/cat.exp
similarity index 100%
rename from test/_completion_to_review/cat.exp
rename to test/completion/cat.exp
diff --git a/test/_completion_to_review/cc.exp b/test/completion/cc.exp
similarity index 100%
rename from test/_completion_to_review/cc.exp
rename to test/completion/cc.exp
diff --git a/test/_completion_to_review/cdrecord.exp b/test/completion/cdrecord.exp
similarity index 100%
rename from test/_completion_to_review/cdrecord.exp
rename to test/completion/cdrecord.exp
diff --git a/test/_completion_to_review/change_pw.exp b/test/completion/change_pw.exp
similarity index 100%
rename from test/_completion_to_review/change_pw.exp
rename to test/completion/change_pw.exp
diff --git a/test/_completion_to_review/check_db.exp b/test/completion/check_db.exp
similarity index 100%
rename from test/_completion_to_review/check_db.exp
rename to test/completion/check_db.exp
diff --git a/test/_completion_to_review/check_perms.exp b/test/completion/check_perms.exp
similarity index 100%
rename from test/_completion_to_review/check_perms.exp
rename to test/completion/check_perms.exp
diff --git a/test/_completion_to_review/chkconfig.exp b/test/completion/chkconfig.exp
similarity index 100%
rename from test/_completion_to_review/chkconfig.exp
rename to test/completion/chkconfig.exp
diff --git a/test/_completion_to_review/ci.exp b/test/completion/ci.exp
similarity index 100%
rename from test/_completion_to_review/ci.exp
rename to test/completion/ci.exp
diff --git a/test/_completion_to_review/civclient.exp b/test/completion/civclient.exp
similarity index 100%
rename from test/_completion_to_review/civclient.exp
rename to test/completion/civclient.exp
diff --git a/test/_completion_to_review/civserver.exp b/test/completion/civserver.exp
similarity index 100%
rename from test/_completion_to_review/civserver.exp
rename to test/completion/civserver.exp
diff --git a/test/_completion_to_review/cksfv.exp b/test/completion/cksfv.exp
similarity index 100%
rename from test/_completion_to_review/cksfv.exp
rename to test/completion/cksfv.exp
diff --git a/test/_completion_to_review/cleanarch.exp b/test/completion/cleanarch.exp
similarity index 100%
rename from test/_completion_to_review/cleanarch.exp
rename to test/completion/cleanarch.exp
diff --git a/test/_completion_to_review/clisp.exp b/test/completion/clisp.exp
similarity index 100%
rename from test/_completion_to_review/clisp.exp
rename to test/completion/clisp.exp
diff --git a/test/_completion_to_review/clone_member.exp b/test/completion/clone_member.exp
similarity index 100%
rename from test/_completion_to_review/clone_member.exp
rename to test/completion/clone_member.exp
diff --git a/test/_completion_to_review/co.exp b/test/completion/co.exp
similarity index 100%
rename from test/_completion_to_review/co.exp
rename to test/completion/co.exp
diff --git a/test/_completion_to_review/composite.exp b/test/completion/composite.exp
similarity index 100%
rename from test/_completion_to_review/composite.exp
rename to test/completion/composite.exp
diff --git a/test/_completion_to_review/config_list.exp b/test/completion/config_list.exp
similarity index 100%
rename from test/_completion_to_review/config_list.exp
rename to test/completion/config_list.exp
diff --git a/test/_completion_to_review/configure.exp b/test/completion/configure.exp
similarity index 100%
rename from test/_completion_to_review/configure.exp
rename to test/completion/configure.exp
diff --git a/test/_completion_to_review/convert.exp b/test/completion/convert.exp
similarity index 100%
rename from test/_completion_to_review/convert.exp
rename to test/completion/convert.exp
diff --git a/test/_completion_to_review/cp.exp b/test/completion/cp.exp
similarity index 100%
rename from test/_completion_to_review/cp.exp
rename to test/completion/cp.exp
diff --git a/test/_completion_to_review/cpio.exp b/test/completion/cpio.exp
similarity index 100%
rename from test/_completion_to_review/cpio.exp
rename to test/completion/cpio.exp
diff --git a/test/_completion_to_review/createdb.exp b/test/completion/createdb.exp
similarity index 100%
rename from test/_completion_to_review/createdb.exp
rename to test/completion/createdb.exp
diff --git a/test/_completion_to_review/csplit.exp b/test/completion/csplit.exp
similarity index 100%
rename from test/_completion_to_review/csplit.exp
rename to test/completion/csplit.exp
diff --git a/test/_completion_to_review/cut.exp b/test/completion/cut.exp
similarity index 100%
rename from test/_completion_to_review/cut.exp
rename to test/completion/cut.exp
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/bash.exp
similarity index 82%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/bash.exp
index 4288adb..4caf58f 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/bash.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "bash --"
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/bc.exp
similarity index 83%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/bc.exp
index 4288adb..c437d03 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/bc.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "bc --"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/bison.exp
similarity index 82%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/bison.exp
index 26065d2..a3dea1e 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/bison.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "bison --"
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/bk.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/bk.exp
index 4288adb..4915136 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/bk.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "bk "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/btdownloadcurses.py.exp
similarity index 76%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/btdownloadcurses.py.exp
index 26065d2..9dc0ba5 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/btdownloadcurses.py.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "btdownloadcurses.py "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/btdownloadgui.py.exp
similarity index 78%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/btdownloadgui.py.exp
index 26065d2..03897a5 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/btdownloadgui.py.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "btdownloadgui.py "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/btdownloadheadless.py.exp
similarity index 76%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/btdownloadheadless.py.exp
index 26065d2..69c6295 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/btdownloadheadless.py.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "btdownloadheadless.py "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/bzip2.exp
similarity index 83%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/bzip2.exp
index 4288adb..e5389a2 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/bzip2.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "bzip2 "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/c++.exp
similarity index 71%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/c++.exp
index 26065d2..1fe4bb1 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/c++.exp
@@ -11,7 +11,8 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+set test "Tab should complete"
+assert_complete_any "c++ "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cancel.exp
similarity index 82%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cancel.exp
index 4288adb..7ba79da 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cancel.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cancel "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/cardctl.exp
similarity index 82%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/cardctl.exp
index 26065d2..b5d7e88 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/cardctl.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "cardctl "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cat.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cat.exp
index 4288adb..46e8775 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cat.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cat "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cc.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cc.exp
index 4288adb..1d63d00 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cc.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cc "
sync_after_int
diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 25d02f0..d4c06d9 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -12,13 +12,7 @@ setup
set test "Tab should complete"
- # Try completion
-set cmd "cd fixture1/"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
-}; # expect
+assert_complete {"bar bar.d/" foo.d/} "cd fixture1/" $test
sync_after_int
@@ -43,27 +37,11 @@ sync_after_int
set test "Tab should complete CDPATH"
# Set CDPATH
-set cmd "CDPATH=\$PWD"
-send "$cmd\r"
-expect -ex "$cmd\r\n"
-expect -ex "/@"
- # Try completion
-set cmd "cd fixture1/fo"
-send "$cmd\t"
-expect {
- -re "cd fixture1/foo.d/$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- default { unresolved "$test" }
-}; # expect
-
+assert_bash_exec "CDPATH=\$PWD";
+assert_complete "fixture1/foo.d/" "cd fixture1/fo" $test
sync_after_int
-
# Reset CDPATH
-set cmd "unset CDPATH"
-send "$cmd\r"
-expect -ex "$cmd\r\n"
-expect -ex "/@"
-
+assert_bash_exec "unset CDPATH"
teardown
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/cdrecord.exp
similarity index 80%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/cdrecord.exp
index 26065d2..d369f79 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/cdrecord.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "cdrecord -d"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/change_pw.exp
similarity index 80%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/change_pw.exp
index 26065d2..ca9bcdb 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/change_pw.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "change_pw -"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/check_db.exp
similarity index 81%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/check_db.exp
index 26065d2..ca59a71 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/check_db.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "check_db -"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/check_perms.exp
similarity index 79%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/check_perms.exp
index 26065d2..a58995b 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/check_perms.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "check_perms -"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/chkconfig.exp
similarity index 81%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/chkconfig.exp
index 26065d2..e7469b3 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/chkconfig.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "chkconfig "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/ci.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/ci.exp
index 4288adb..09105ee 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/ci.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "ci "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/civclient.exp
similarity index 80%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/civclient.exp
index 26065d2..8159c2b 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/civclient.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "civclient -"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/civserver.exp
similarity index 80%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/civserver.exp
index 26065d2..df45968 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/civserver.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "civserver -"
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cksfv.exp
similarity index 82%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cksfv.exp
index 4288adb..a40a502 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cksfv.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cksfv -"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/cleanarch.exp
similarity index 80%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/cleanarch.exp
index 26065d2..e3145e8 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/cleanarch.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "cleanarch -"
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/clisp.exp
similarity index 83%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/clisp.exp
index 4288adb..2bc599a 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/clisp.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "clisp "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/clone_member.exp
similarity index 79%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/clone_member.exp
index 26065d2..34b4db5 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/clone_member.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "clone_member -"
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/co.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/co.exp
index 4288adb..49fe3a6 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/co.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "co "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/composite.exp
similarity index 81%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/composite.exp
index 26065d2..e39ce72 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/composite.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "composite "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/config_list.exp
similarity index 79%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/config_list.exp
index 26065d2..5246c86 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/config_list.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "config_list -"
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/configure.exp
similarity index 81%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/configure.exp
index 26065d2..15d2c9e 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/configure.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "configure "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/convert.exp
similarity index 82%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/convert.exp
index 26065d2..d8a77e3 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/convert.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "convert "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cp.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cp.exp
index 4288adb..9fe4653 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cp.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cp "
sync_after_int
diff --git a/test/lib/completions/apt-build.exp b/test/lib/completions/cpio.exp
similarity index 64%
copy from test/lib/completions/apt-build.exp
copy to test/lib/completions/cpio.exp
index fd09d0e..df8f94e 100644
--- a/test/lib/completions/apt-build.exp
+++ b/test/lib/completions/cpio.exp
@@ -11,7 +11,13 @@ proc teardown {} {
setup
-assert_complete_any "apt-build "
+assert_complete_any "cpio --"
+
+
+sync_after_int
+
+
+assert_complete_any "cpio -R "
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/createdb.exp
similarity index 81%
copy from test/lib/completions/animate.exp
copy to test/lib/completions/createdb.exp
index 26065d2..1e5cdbe 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/createdb.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "animate "
+assert_complete_any "createdb "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/csplit.exp
similarity index 82%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/csplit.exp
index 4288adb..3a66a62 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/csplit.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "csplit "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cut.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cut.exp
index 4288adb..b9bcf6c 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cut.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cut "
sync_after_int
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/cvs.exp
similarity index 84%
copy from test/lib/completions/awk.exp
copy to test/lib/completions/cvs.exp
index 4288adb..2e233c6 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/cvs.exp
@@ -11,7 +11,7 @@ proc teardown {} {
setup
-assert_complete_any "awk "
+assert_complete_any "cvs "
sync_after_int
diff --git a/test/lib/completions_to_review/bash.exp b/test/lib/completions_to_review/bash.exp
deleted file mode 100644
index 948989d..0000000
--- a/test/lib/completions_to_review/bash.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "bash --"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/bc.exp b/test/lib/completions_to_review/bc.exp
deleted file mode 100644
index 9df3978..0000000
--- a/test/lib/completions_to_review/bc.exp
+++ /dev/null
@@ -1,30 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "bc --"
-send "$cmd\t"
- # NOTE: Wait in case `bc' isn't installed, so that "^$cdm$" doesn't match
- # before comp_install has finished
-sleep .5
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re "^$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/bison.exp b/test/lib/completions_to_review/bison.exp
deleted file mode 100644
index ecb51ea..0000000
--- a/test/lib/completions_to_review/bison.exp
+++ /dev/null
@@ -1,27 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "bison --"
-send "$cmd\t"
-expect {
- -re "^$cmd.*$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sleep .5
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/bk.exp b/test/lib/completions_to_review/bk.exp
deleted file mode 100644
index 0203587..0000000
--- a/test/lib/completions_to_review/bk.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "bk "
-send "$cmd\t"
-expect {
- -re "^${cmd}(bash: bk: command not found|)\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/btdownloadcurses.py.exp b/test/lib/completions_to_review/btdownloadcurses.py.exp
deleted file mode 100644
index 8a4acd1..0000000
--- a/test/lib/completions_to_review/btdownloadcurses.py.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "btdownloadcurses.py "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/btdownloadgui.py.exp b/test/lib/completions_to_review/btdownloadgui.py.exp
deleted file mode 100644
index d181e53..0000000
--- a/test/lib/completions_to_review/btdownloadgui.py.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "btdownloadgui.py "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/btdownloadheadless.py.exp b/test/lib/completions_to_review/btdownloadheadless.py.exp
deleted file mode 100644
index a76ad5a..0000000
--- a/test/lib/completions_to_review/btdownloadheadless.py.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "btdownloadheadless.py "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/bzip2.exp b/test/lib/completions_to_review/bzip2.exp
deleted file mode 100644
index 794108b..0000000
--- a/test/lib/completions_to_review/bzip2.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "bzip2 "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/c++.exp b/test/lib/completions_to_review/c++.exp
deleted file mode 100644
index c8a2449..0000000
--- a/test/lib/completions_to_review/c++.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "c++ "
-send "$cmd\t"
-expect {
- -re "^c\\+\\+ \r\n.*c\\+\\+ $" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cancel.exp b/test/lib/completions_to_review/cancel.exp
deleted file mode 100644
index c860026..0000000
--- a/test/lib/completions_to_review/cancel.exp
+++ /dev/null
@@ -1,27 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cancel "
-send "$cmd\t"
-expect {
- -re "^${cmd}(bash: lpstat: command not found\r\n)*$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sleep .4
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cardctl.exp b/test/lib/completions_to_review/cardctl.exp
deleted file mode 100644
index acf2822..0000000
--- a/test/lib/completions_to_review/cardctl.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cardctl "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cat.exp b/test/lib/completions_to_review/cat.exp
deleted file mode 100644
index 5f8a953..0000000
--- a/test/lib/completions_to_review/cat.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cat "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cc.exp b/test/lib/completions_to_review/cc.exp
deleted file mode 100644
index 22ac01e..0000000
--- a/test/lib/completions_to_review/cc.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cc "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cdrecord.exp b/test/lib/completions_to_review/cdrecord.exp
deleted file mode 100644
index 06b0578..0000000
--- a/test/lib/completions_to_review/cdrecord.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cdrecord -d"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/change_pw.exp b/test/lib/completions_to_review/change_pw.exp
deleted file mode 100644
index 3e888ee..0000000
--- a/test/lib/completions_to_review/change_pw.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "change_pw -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/check_db.exp b/test/lib/completions_to_review/check_db.exp
deleted file mode 100644
index dc34310..0000000
--- a/test/lib/completions_to_review/check_db.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "check_db -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/check_perms.exp b/test/lib/completions_to_review/check_perms.exp
deleted file mode 100644
index 8add9cd..0000000
--- a/test/lib/completions_to_review/check_perms.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "check_perms -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/chkconfig.exp b/test/lib/completions_to_review/chkconfig.exp
deleted file mode 100644
index 5bd2a32..0000000
--- a/test/lib/completions_to_review/chkconfig.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should show completions"
- # Try completion
-set cmd "chkconfig "
-send "$cmd\t"
-expect {
- -re "$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/ci.exp b/test/lib/completions_to_review/ci.exp
deleted file mode 100644
index 245a187..0000000
--- a/test/lib/completions_to_review/ci.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "ci "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/civclient.exp b/test/lib/completions_to_review/civclient.exp
deleted file mode 100644
index 228bbbf..0000000
--- a/test/lib/completions_to_review/civclient.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "civclient -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/civserver.exp b/test/lib/completions_to_review/civserver.exp
deleted file mode 100644
index bcbed86..0000000
--- a/test/lib/completions_to_review/civserver.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "civserver -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cksfv.exp b/test/lib/completions_to_review/cksfv.exp
deleted file mode 100644
index bf88b2f..0000000
--- a/test/lib/completions_to_review/cksfv.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cksfv -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cleanarch.exp b/test/lib/completions_to_review/cleanarch.exp
deleted file mode 100644
index 1f787e6..0000000
--- a/test/lib/completions_to_review/cleanarch.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cleanarch -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/clisp.exp b/test/lib/completions_to_review/clisp.exp
deleted file mode 100644
index 9ad4e26..0000000
--- a/test/lib/completions_to_review/clisp.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "clisp "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/clone_member.exp b/test/lib/completions_to_review/clone_member.exp
deleted file mode 100644
index 4b72304..0000000
--- a/test/lib/completions_to_review/clone_member.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "clone_member -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/co.exp b/test/lib/completions_to_review/co.exp
deleted file mode 100644
index 240218f..0000000
--- a/test/lib/completions_to_review/co.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "co "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/composite.exp b/test/lib/completions_to_review/composite.exp
deleted file mode 100644
index 2c9e6be..0000000
--- a/test/lib/completions_to_review/composite.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "composite "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/config_list.exp b/test/lib/completions_to_review/config_list.exp
deleted file mode 100644
index bca7c85..0000000
--- a/test/lib/completions_to_review/config_list.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "config_list -"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/configure.exp b/test/lib/completions_to_review/configure.exp
deleted file mode 100644
index d597f59..0000000
--- a/test/lib/completions_to_review/configure.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "configure "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/convert.exp b/test/lib/completions_to_review/convert.exp
deleted file mode 100644
index 471434d..0000000
--- a/test/lib/completions_to_review/convert.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "convert "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cp.exp b/test/lib/completions_to_review/cp.exp
deleted file mode 100644
index 435b5e2..0000000
--- a/test/lib/completions_to_review/cp.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cp "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cpio.exp b/test/lib/completions_to_review/cpio.exp
deleted file mode 100644
index 63fb439..0000000
--- a/test/lib/completions_to_review/cpio.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cpio --"
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*/@$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-set test "-R should complete usergroups"
- # Try completion
-set cmd "cpio -R "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/createdb.exp b/test/lib/completions_to_review/createdb.exp
deleted file mode 100644
index 452aba4..0000000
--- a/test/lib/completions_to_review/createdb.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "createdb "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/csplit.exp b/test/lib/completions_to_review/csplit.exp
deleted file mode 100644
index 98ee53e..0000000
--- a/test/lib/completions_to_review/csplit.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "csplit "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cut.exp b/test/lib/completions_to_review/cut.exp
deleted file mode 100644
index 5c68362..0000000
--- a/test/lib/completions_to_review/cut.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cut "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/cvs.exp b/test/lib/completions_to_review/cvs.exp
deleted file mode 100644
index 59b77e6..0000000
--- a/test/lib/completions_to_review/cvs.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
- # Try completion
-set cmd "cvs "
-send "$cmd\t"
-expect {
- -re "^$cmd\r\n.*$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/library.exp b/test/lib/library.exp
index 7764628..6b4fe1a 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -43,18 +43,6 @@ proc assert_bash_type {command} {
}; # assert_bash_type()
-# Make sure any completions are returned
-proc assert_complete_any {cmd {test ""} {prompt /@}} {
- if {$test == ""} {set test "$cmd should show completions"}
- send "$cmd\t"
- expect {
- -re "^$cmd\r\n.*$prompt$cmd$" { pass "$test" }
- -re /@ { unresolved "$test at prompt" }
- -re eof { unresolved "eof" }
- }; # expect
-}; # assert_complete_any()
-
-
# Make sure the expected items are also returned by TAB-completing the
# specified command.
# Break items into chunks because `expect' seems to have a limited buffer size
@@ -94,6 +82,24 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20}} {
}; # assert_complete()
+# Make sure any completions are returned
+proc assert_complete_any {cmd {test ""} {prompt /@}} {
+ if {$test == ""} {set test "$cmd should show completions"}
+ send "$cmd\t"
+ expect -ex "$cmd"
+ # Escape special regexp characters
+ regsub -all {([\[\]\(\)\.\\\+])} $cmd {\\\1} cmd
+ # NOTE: A timeout of 1 is used to match quicker when no completion are
+ # returned. E.g. within `cancel.exp' when no print jobs are available.
+ expect {
+ -timeout 1
+ -re "^\r\n.*$prompt$cmd$" { pass "$test" }
+ -re /@ { unresolved "$test at prompt" }
+ -re eof { unresolved "eof" }
+ }; # expect
+}; # assert_complete_any()
+
+
# Make sure the bash environment hasn't changed between now and the last call
# to `save_env()'.
# @param string $sed Sed commands to preprocess diff output.
--
bash-completion
More information about the Bash-completion-commits
mailing list