Reviewed tests b* & c*

111 files changed, 758 insertions, 997 deletions

diff --git a/test/_completion_to_review/bc.exp b/test/_completion_to_review/bc.exp
deleted file mode 100644
index 69b21afd..00000000
--- 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 159f50c0..00000000
--- 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 2e339cfb..00000000
--- 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
index ed373f84..ed373f84 100644
--- a/test/_completion_to_review/bash.exp
+++ b/test/completion/bash.exp
diff --git a/test/completion/bc.exp b/test/completion/bc.exp
new file mode 100644
index 00000000..c177a5bd
--- /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 00000000..f9b3756b
--- /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
index 2a0da514..2a0da514 100644
--- a/test/_completion_to_review/bk.exp
+++ b/test/completion/bk.exp
diff --git a/test/_completion_to_review/btdownloadcurses.py.exp b/test/completion/btdownloadcurses.py.exp
index 9e61174c..9e61174c 100644
--- a/test/_completion_to_review/btdownloadcurses.py.exp
+++ b/test/completion/btdownloadcurses.py.exp
diff --git a/test/_completion_to_review/btdownloadgui.py.exp b/test/completion/btdownloadgui.py.exp
index 9cbb959b..9cbb959b 100644
--- a/test/_completion_to_review/btdownloadgui.py.exp
+++ b/test/completion/btdownloadgui.py.exp
diff --git a/test/_completion_to_review/btdownloadheadless.py.exp b/test/completion/btdownloadheadless.py.exp
index 14c568fb..14c568fb 100644
--- a/test/_completion_to_review/btdownloadheadless.py.exp
+++ b/test/completion/btdownloadheadless.py.exp
diff --git a/test/_completion_to_review/c++.exp b/test/completion/c++.exp
index 0b3ff2cb..0b3ff2cb 100644
--- a/test/_completion_to_review/c++.exp
+++ b/test/completion/c++.exp
diff --git a/test/completion/cancel.exp b/test/completion/cancel.exp
new file mode 100644
index 00000000..b97e25f3
--- /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
index 9243c80d..9243c80d 100644
--- a/test/_completion_to_review/cardctl.exp
+++ b/test/completion/cardctl.exp
diff --git a/test/_completion_to_review/cat.exp b/test/completion/cat.exp
index b889d0ea..b889d0ea 100644
--- a/test/_completion_to_review/cat.exp
+++ b/test/completion/cat.exp
diff --git a/test/_completion_to_review/cc.exp b/test/completion/cc.exp
index f206d99b..f206d99b 100644
--- a/test/_completion_to_review/cc.exp
+++ b/test/completion/cc.exp
diff --git a/test/_completion_to_review/cdrecord.exp b/test/completion/cdrecord.exp
index 692305f4..692305f4 100644
--- a/test/_completion_to_review/cdrecord.exp
+++ b/test/completion/cdrecord.exp
diff --git a/test/_completion_to_review/change_pw.exp b/test/completion/change_pw.exp
index c1a996b3..c1a996b3 100644
--- a/test/_completion_to_review/change_pw.exp
+++ b/test/completion/change_pw.exp
diff --git a/test/_completion_to_review/check_db.exp b/test/completion/check_db.exp
index 19bc9fc6..19bc9fc6 100644
--- a/test/_completion_to_review/check_db.exp
+++ b/test/completion/check_db.exp
diff --git a/test/_completion_to_review/check_perms.exp b/test/completion/check_perms.exp
index e664246c..e664246c 100644
--- a/test/_completion_to_review/check_perms.exp
+++ b/test/completion/check_perms.exp
diff --git a/test/_completion_to_review/chkconfig.exp b/test/completion/chkconfig.exp
index da12ed4d..da12ed4d 100644
--- a/test/_completion_to_review/chkconfig.exp
+++ b/test/completion/chkconfig.exp
diff --git a/test/_completion_to_review/ci.exp b/test/completion/ci.exp
index cec19b32..cec19b32 100644
--- a/test/_completion_to_review/ci.exp
+++ b/test/completion/ci.exp
diff --git a/test/_completion_to_review/civclient.exp b/test/completion/civclient.exp
index 933ec8ef..933ec8ef 100644
--- a/test/_completion_to_review/civclient.exp
+++ b/test/completion/civclient.exp
diff --git a/test/_completion_to_review/civserver.exp b/test/completion/civserver.exp
index a3eb4a5c..a3eb4a5c 100644
--- a/test/_completion_to_review/civserver.exp
+++ b/test/completion/civserver.exp
diff --git a/test/_completion_to_review/cksfv.exp b/test/completion/cksfv.exp
index 12e398ee..12e398ee 100644
--- a/test/_completion_to_review/cksfv.exp
+++ b/test/completion/cksfv.exp
diff --git a/test/_completion_to_review/cleanarch.exp b/test/completion/cleanarch.exp
index e7efa8bc..e7efa8bc 100644
--- a/test/_completion_to_review/cleanarch.exp
+++ b/test/completion/cleanarch.exp
diff --git a/test/_completion_to_review/clisp.exp b/test/completion/clisp.exp
index d4a35254..d4a35254 100644
--- a/test/_completion_to_review/clisp.exp
+++ b/test/completion/clisp.exp
diff --git a/test/_completion_to_review/clone_member.exp b/test/completion/clone_member.exp
index f2c7fa00..f2c7fa00 100644
--- a/test/_completion_to_review/clone_member.exp
+++ b/test/completion/clone_member.exp
diff --git a/test/_completion_to_review/co.exp b/test/completion/co.exp
index 6603ca4e..6603ca4e 100644
--- a/test/_completion_to_review/co.exp
+++ b/test/completion/co.exp
diff --git a/test/_completion_to_review/composite.exp b/test/completion/composite.exp
index e70c482b..e70c482b 100644
--- a/test/_completion_to_review/composite.exp
+++ b/test/completion/composite.exp
diff --git a/test/_completion_to_review/config_list.exp b/test/completion/config_list.exp
index d014f572..d014f572 100644
--- a/test/_completion_to_review/config_list.exp
+++ b/test/completion/config_list.exp
diff --git a/test/_completion_to_review/configure.exp b/test/completion/configure.exp
index 4b0c4964..4b0c4964 100644
--- a/test/_completion_to_review/configure.exp
+++ b/test/completion/configure.exp
diff --git a/test/_completion_to_review/convert.exp b/test/completion/convert.exp
index 90c2cbfd..90c2cbfd 100644
--- a/test/_completion_to_review/convert.exp
+++ b/test/completion/convert.exp
diff --git a/test/_completion_to_review/cp.exp b/test/completion/cp.exp
index 7f532c13..7f532c13 100644
--- a/test/_completion_to_review/cp.exp
+++ b/test/completion/cp.exp
diff --git a/test/_completion_to_review/cpio.exp b/test/completion/cpio.exp
index 544fe0bb..544fe0bb 100644
--- a/test/_completion_to_review/cpio.exp
+++ b/test/completion/cpio.exp
diff --git a/test/_completion_to_review/createdb.exp b/test/completion/createdb.exp
index 90ebe305..90ebe305 100644
--- a/test/_completion_to_review/createdb.exp
+++ b/test/completion/createdb.exp
diff --git a/test/_completion_to_review/csplit.exp b/test/completion/csplit.exp
index f4c0bd78..f4c0bd78 100644
--- a/test/_completion_to_review/csplit.exp
+++ b/test/completion/csplit.exp
diff --git a/test/_completion_to_review/cut.exp b/test/completion/cut.exp
index 3458062c..3458062c 100644
--- a/test/_completion_to_review/cut.exp
+++ b/test/completion/cut.exp
diff --git a/test/lib/completions/bash.exp b/test/lib/completions/bash.exp
new file mode 100644
index 00000000..4caf58fc
--- /dev/null
+++ b/test/lib/completions/bash.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "bash --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/bc.exp b/test/lib/completions/bc.exp
new file mode 100644
index 00000000..c437d037
--- /dev/null
+++ b/test/lib/completions/bc.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "bc --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/bison.exp b/test/lib/completions/bison.exp
new file mode 100644
index 00000000..a3dea1e0
--- /dev/null
+++ b/test/lib/completions/bison.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "bison --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/bk.exp b/test/lib/completions/bk.exp
new file mode 100644
index 00000000..4915136e
--- /dev/null
+++ b/test/lib/completions/bk.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "bk "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/btdownloadcurses.py.exp b/test/lib/completions/btdownloadcurses.py.exp
new file mode 100644
index 00000000..9dc0ba5a
--- /dev/null
+++ b/test/lib/completions/btdownloadcurses.py.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "btdownloadcurses.py "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/btdownloadgui.py.exp b/test/lib/completions/btdownloadgui.py.exp
new file mode 100644
index 00000000..03897a53
--- /dev/null
+++ b/test/lib/completions/btdownloadgui.py.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "btdownloadgui.py "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/btdownloadheadless.py.exp b/test/lib/completions/btdownloadheadless.py.exp
new file mode 100644
index 00000000..69c62950
--- /dev/null
+++ b/test/lib/completions/btdownloadheadless.py.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "btdownloadheadless.py "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/bzip2.exp b/test/lib/completions/bzip2.exp
new file mode 100644
index 00000000..e5389a2a
--- /dev/null
+++ b/test/lib/completions/bzip2.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "bzip2 "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/c++.exp b/test/lib/completions/c++.exp
new file mode 100644
index 00000000..1fe4bb13
--- /dev/null
+++ b/test/lib/completions/c++.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+set test "Tab should complete"
+assert_complete_any "c++ "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cancel.exp b/test/lib/completions/cancel.exp
new file mode 100644
index 00000000..7ba79daf
--- /dev/null
+++ b/test/lib/completions/cancel.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cancel "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cardctl.exp b/test/lib/completions/cardctl.exp
new file mode 100644
index 00000000..b5d7e88d
--- /dev/null
+++ b/test/lib/completions/cardctl.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cardctl "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cat.exp b/test/lib/completions/cat.exp
new file mode 100644
index 00000000..46e8775f
--- /dev/null
+++ b/test/lib/completions/cat.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cat "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cc.exp b/test/lib/completions/cc.exp
new file mode 100644
index 00000000..1d63d006
--- /dev/null
+++ b/test/lib/completions/cc.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cc "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 25d02f05..d4c06d9d 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/cdrecord.exp b/test/lib/completions/cdrecord.exp
new file mode 100644
index 00000000..d369f79d
--- /dev/null
+++ b/test/lib/completions/cdrecord.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cdrecord -d"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/change_pw.exp b/test/lib/completions/change_pw.exp
new file mode 100644
index 00000000..ca9bcdbd
--- /dev/null
+++ b/test/lib/completions/change_pw.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "change_pw -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/check_db.exp b/test/lib/completions/check_db.exp
new file mode 100644
index 00000000..ca59a715
--- /dev/null
+++ b/test/lib/completions/check_db.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "check_db -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/check_perms.exp b/test/lib/completions/check_perms.exp
new file mode 100644
index 00000000..a58995b0
--- /dev/null
+++ b/test/lib/completions/check_perms.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "check_perms -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/chkconfig.exp b/test/lib/completions/chkconfig.exp
new file mode 100644
index 00000000..e7469b34
--- /dev/null
+++ b/test/lib/completions/chkconfig.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "chkconfig "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ci.exp b/test/lib/completions/ci.exp
new file mode 100644
index 00000000..09105eec
--- /dev/null
+++ b/test/lib/completions/ci.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ci "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/civclient.exp b/test/lib/completions/civclient.exp
new file mode 100644
index 00000000..8159c2bc
--- /dev/null
+++ b/test/lib/completions/civclient.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "civclient -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/civserver.exp b/test/lib/completions/civserver.exp
new file mode 100644
index 00000000..df459688
--- /dev/null
+++ b/test/lib/completions/civserver.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "civserver -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cksfv.exp b/test/lib/completions/cksfv.exp
new file mode 100644
index 00000000..a40a5023
--- /dev/null
+++ b/test/lib/completions/cksfv.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cksfv -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cleanarch.exp b/test/lib/completions/cleanarch.exp
new file mode 100644
index 00000000..e3145e81
--- /dev/null
+++ b/test/lib/completions/cleanarch.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cleanarch -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/clisp.exp b/test/lib/completions/clisp.exp
new file mode 100644
index 00000000..2bc599ac
--- /dev/null
+++ b/test/lib/completions/clisp.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "clisp "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/clone_member.exp b/test/lib/completions/clone_member.exp
new file mode 100644
index 00000000..34b4db57
--- /dev/null
+++ b/test/lib/completions/clone_member.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "clone_member -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/co.exp b/test/lib/completions/co.exp
new file mode 100644
index 00000000..49fe3a64
--- /dev/null
+++ b/test/lib/completions/co.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "co "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/composite.exp b/test/lib/completions/composite.exp
new file mode 100644
index 00000000..e39ce72f
--- /dev/null
+++ b/test/lib/completions/composite.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "composite "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/config_list.exp b/test/lib/completions/config_list.exp
new file mode 100644
index 00000000..5246c860
--- /dev/null
+++ b/test/lib/completions/config_list.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "config_list -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/configure.exp b/test/lib/completions/configure.exp
new file mode 100644
index 00000000..15d2c9e6
--- /dev/null
+++ b/test/lib/completions/configure.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "configure "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/convert.exp b/test/lib/completions/convert.exp
new file mode 100644
index 00000000..d8a77e35
--- /dev/null
+++ b/test/lib/completions/convert.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "convert "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cp.exp b/test/lib/completions/cp.exp
new file mode 100644
index 00000000..9fe46537
--- /dev/null
+++ b/test/lib/completions/cp.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cp "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cpio.exp b/test/lib/completions/cpio.exp
new file mode 100644
index 00000000..df8f94e4
--- /dev/null
+++ b/test/lib/completions/cpio.exp
@@ -0,0 +1,26 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cpio --"
+
+
+sync_after_int
+
+
+assert_complete_any "cpio -R "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/createdb.exp b/test/lib/completions/createdb.exp
new file mode 100644
index 00000000..1e5cdbe7
--- /dev/null
+++ b/test/lib/completions/createdb.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "createdb "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/csplit.exp b/test/lib/completions/csplit.exp
new file mode 100644
index 00000000..3a66a627
--- /dev/null
+++ b/test/lib/completions/csplit.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "csplit "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cut.exp b/test/lib/completions/cut.exp
new file mode 100644
index 00000000..b9bcf6c5
--- /dev/null
+++ b/test/lib/completions/cut.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cut "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/cvs.exp b/test/lib/completions/cvs.exp
new file mode 100644
index 00000000..2e233c6f
--- /dev/null
+++ b/test/lib/completions/cvs.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cvs "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions_to_review/bash.exp b/test/lib/completions_to_review/bash.exp
deleted file mode 100644
index 948989d7..00000000
--- 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 9df39780..00000000
--- 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 ecb51ea0..00000000
--- 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 0203587b..00000000
--- 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 8a4acd15..00000000
--- 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 d181e53d..00000000
--- 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 a76ad5ad..00000000
--- 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 794108ba..00000000
--- 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 c8a24495..00000000
--- 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 c8600262..00000000
--- 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 acf2822e..00000000
--- 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 5f8a9536..00000000
--- 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 22ac01ee..00000000
--- 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 06b05786..00000000
--- 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 3e888ee3..00000000
--- 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 dc343102..00000000
--- 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 8add9cdc..00000000
--- 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 5bd2a32d..00000000
--- 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 245a1870..00000000
--- 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 228bbbf1..00000000
--- 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 bcbed865..00000000
--- 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 bf88b2f7..00000000
--- 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 1f787e60..00000000
--- 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 9ad4e261..00000000
--- 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 4b723046..00000000
--- 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 240218f8..00000000
--- 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 2c9e6bec..00000000
--- 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 bca7c851..00000000
--- 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 d597f59a..00000000
--- 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 471434de..00000000
--- 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 435b5e24..00000000
--- 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 63fb439d..00000000
--- 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 452aba48..00000000
--- 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 98ee53e9..00000000
--- 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 5c68362a..00000000
--- 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 59b77e66..00000000
--- 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 77646285..6b4fe1a4 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.