[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 51b3e20ebcf5f5b598ea33a6d1d393ffa5990430
Freddy Vulto
fvulto at gmail.com
Fri Jun 18 15:22:17 UTC 2010
The following commit has been merged in the master branch:
commit 51b3e20ebcf5f5b598ea33a6d1d393ffa5990430
Author: Freddy Vulto <fvulto at gmail.com>
Date: Fri Jun 18 17:21:38 2010 +0200
(testsuite) Drop ending block comments
Instead of writing `}; # if', write just `}' as was discussed here:
http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01815.html
diff --git a/test/config/default.exp b/test/config/default.exp
index d1c04e7..029f11d 100644
--- a/test/config/default.exp
+++ b/test/config/default.exp
@@ -1,23 +1,23 @@
- # Set default expect fallback routines
+# Set default expect fallback routines
expect_after {
eof {
if {[info exists test]} {
fail "$test at eof"
} else {
fail "[info level 1] at eof"
- }; # if
- }; # eof
+ }
+ }
timeout {
if {[info exists test]} {
fail "$test at timeout"
} else {
fail "[info level 1] at timeout"
- }; # if
- }; # timeout
-}; # expect_after()
+ }
+ }
+}
- # Call tool_start(), if available
+# Call tool_start(), if available
if { [info procs "${tool}_start"] != "" } {
${tool}_start
-}; # if
+}
diff --git a/test/lib/completions/a2ps.exp b/test/lib/completions/a2ps.exp
index 796e14c..77cd07f 100644
--- a/test/lib/completions/a2ps.exp
+++ b/test/lib/completions/a2ps.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/abook.exp b/test/lib/completions/abook.exp
index 3f4e301..43f6272 100644
--- a/test/lib/completions/abook.exp
+++ b/test/lib/completions/abook.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/acroread.exp b/test/lib/completions/acroread.exp
index 4f11f90..f1754e9 100644
--- a/test/lib/completions/acroread.exp
+++ b/test/lib/completions/acroread.exp
@@ -1,13 +1,13 @@
proc setup {} {
save_env
assert_bash_exec "touch fixtures/shared/default/t.pdf"; # Create temporary files
-}; # setup()
+}
proc teardown {} {
assert_bash_exec "rm fixtures/shared/default/t.pdf"; # Remove temporary files
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/add_members.exp b/test/lib/completions/add_members.exp
index 02cd762..46c7a68 100644
--- a/test/lib/completions/add_members.exp
+++ b/test/lib/completions/add_members.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/alias.exp b/test/lib/completions/alias.exp
index e6b88d0..9dba4e6 100644
--- a/test/lib/completions/alias.exp
+++ b/test/lib/completions/alias.exp
@@ -3,13 +3,13 @@ proc setup {} {
assert_bash_exec "alias foo=bar"
assert_bash_exec "alias bar='foo foo'"
save_env
-}; # setup()
+}
proc teardown {} {
assert_bash_exec "unalias -a"; # Remove all aliases
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -34,7 +34,7 @@ expect {
-re "^alias foo\b\b\bfoo=foo\b\b\b$" { fail "$test: Wrong cursor position" }
-re /@ { unresolved "$test" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/animate.exp
index 26065d2..12314d7 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/animate.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ant.exp b/test/lib/completions/ant.exp
index 8129443..de57f24 100644
--- a/test/lib/completions/ant.exp
+++ b/test/lib/completions/ant.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/apache2ctl.exp b/test/lib/completions/apache2ctl.exp
index e63abb1..88e53fc 100644
--- a/test/lib/completions/apache2ctl.exp
+++ b/test/lib/completions/apache2ctl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/apt-build.exp b/test/lib/completions/apt-build.exp
index fd09d0e..01ff04b 100644
--- a/test/lib/completions/apt-build.exp
+++ b/test/lib/completions/apt-build.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/apt-cache.exp b/test/lib/completions/apt-cache.exp
index 5336bea..63be48a 100644
--- a/test/lib/completions/apt-cache.exp
+++ b/test/lib/completions/apt-cache.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/apt-get.exp b/test/lib/completions/apt-get.exp
index 6bd0f3a..66887bd 100644
--- a/test/lib/completions/apt-get.exp
+++ b/test/lib/completions/apt-get.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/aptitude.exp b/test/lib/completions/aptitude.exp
index dde6d26..e6e82ab 100644
--- a/test/lib/completions/aptitude.exp
+++ b/test/lib/completions/aptitude.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/arch.exp b/test/lib/completions/arch.exp
index 9f7114c..0550c76 100644
--- a/test/lib/completions/arch.exp
+++ b/test/lib/completions/arch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/arpspoof.exp b/test/lib/completions/arpspoof.exp
index 7db79f5..91ef518 100644
--- a/test/lib/completions/arpspoof.exp
+++ b/test/lib/completions/arpspoof.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/aspell.exp b/test/lib/completions/aspell.exp
index 4edeb03..9dd5f61 100644
--- a/test/lib/completions/aspell.exp
+++ b/test/lib/completions/aspell.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/autoconf.exp b/test/lib/completions/autoconf.exp
index 4a44b65..53b096d 100644
--- a/test/lib/completions/autoconf.exp
+++ b/test/lib/completions/autoconf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/automake.exp b/test/lib/completions/automake.exp
index cf27364..f875da5 100644
--- a/test/lib/completions/automake.exp
+++ b/test/lib/completions/automake.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/autorpm.exp b/test/lib/completions/autorpm.exp
index 99b743c..2ae4ff8 100644
--- a/test/lib/completions/autorpm.exp
+++ b/test/lib/completions/autorpm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/awk.exp
index 4288adb..260dabc 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/awk.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/bash.exp b/test/lib/completions/bash.exp
index 4caf58f..bf01e76 100644
--- a/test/lib/completions/bash.exp
+++ b/test/lib/completions/bash.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/bc.exp b/test/lib/completions/bc.exp
index c437d03..23c22b6 100644
--- a/test/lib/completions/bc.exp
+++ b/test/lib/completions/bc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/bison.exp b/test/lib/completions/bison.exp
index a3dea1e..4bbb59f 100644
--- a/test/lib/completions/bison.exp
+++ b/test/lib/completions/bison.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/bk.exp b/test/lib/completions/bk.exp
index 4915136..b652e6b 100644
--- a/test/lib/completions/bk.exp
+++ b/test/lib/completions/bk.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/brctl.exp b/test/lib/completions/brctl.exp
index d87002a..57c9edf 100644
--- a/test/lib/completions/brctl.exp
+++ b/test/lib/completions/brctl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/btdownloadcurses.py.exp b/test/lib/completions/btdownloadcurses.py.exp
index 9dc0ba5..71a00de 100644
--- a/test/lib/completions/btdownloadcurses.py.exp
+++ b/test/lib/completions/btdownloadcurses.py.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/btdownloadgui.py.exp b/test/lib/completions/btdownloadgui.py.exp
index 03897a5..65f5677 100644
--- a/test/lib/completions/btdownloadgui.py.exp
+++ b/test/lib/completions/btdownloadgui.py.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/btdownloadheadless.py.exp b/test/lib/completions/btdownloadheadless.py.exp
index 69c6295..3c833bb 100644
--- a/test/lib/completions/btdownloadheadless.py.exp
+++ b/test/lib/completions/btdownloadheadless.py.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/bzip2.exp b/test/lib/completions/bzip2.exp
index e5389a2..2813dd0 100644
--- a/test/lib/completions/bzip2.exp
+++ b/test/lib/completions/bzip2.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/c++.exp b/test/lib/completions/c++.exp
index 1fe4bb1..4dffb04 100644
--- a/test/lib/completions/c++.exp
+++ b/test/lib/completions/c++.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cancel.exp b/test/lib/completions/cancel.exp
index 24ca47c..fc2600b 100644
--- a/test/lib/completions/cancel.exp
+++ b/test/lib/completions/cancel.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -22,7 +22,7 @@ if {[assert_exec {lp -H hold fixtures/shared/default/foo} job "" "untested"]} {
assert_complete $jobs "cancel "
# Remove/cancel the test print job
assert_exec "cancel $job_id"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/cardctl.exp b/test/lib/completions/cardctl.exp
index b5d7e88..9df90f4 100644
--- a/test/lib/completions/cardctl.exp
+++ b/test/lib/completions/cardctl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cat.exp b/test/lib/completions/cat.exp
index 46e8775..01b3659 100644
--- a/test/lib/completions/cat.exp
+++ b/test/lib/completions/cat.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cc.exp b/test/lib/completions/cc.exp
index 1d63d00..eb722de 100644
--- a/test/lib/completions/cc.exp
+++ b/test/lib/completions/cc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 5823357..2101f03 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -29,7 +29,7 @@ expect {
-re "^cd fixtures/shared/default/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" }
-re /@ { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/cdrecord.exp b/test/lib/completions/cdrecord.exp
index d369f79..192d2de 100644
--- a/test/lib/completions/cdrecord.exp
+++ b/test/lib/completions/cdrecord.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/change_pw.exp b/test/lib/completions/change_pw.exp
index ca9bcdb..2830194 100644
--- a/test/lib/completions/change_pw.exp
+++ b/test/lib/completions/change_pw.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/check_db.exp b/test/lib/completions/check_db.exp
index ca59a71..fe34ead 100644
--- a/test/lib/completions/check_db.exp
+++ b/test/lib/completions/check_db.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/check_perms.exp b/test/lib/completions/check_perms.exp
index a58995b..b40b78f 100644
--- a/test/lib/completions/check_perms.exp
+++ b/test/lib/completions/check_perms.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/chgrp.exp b/test/lib/completions/chgrp.exp
index 8dfeea7..e9238bd 100644
--- a/test/lib/completions/chgrp.exp
+++ b/test/lib/completions/chgrp.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/chkconfig.exp b/test/lib/completions/chkconfig.exp
index e7469b3..dae3b3b 100644
--- a/test/lib/completions/chkconfig.exp
+++ b/test/lib/completions/chkconfig.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/chown.exp b/test/lib/completions/chown.exp
index 953b2b0..a758cc1 100644
--- a/test/lib/completions/chown.exp
+++ b/test/lib/completions/chown.exp
@@ -1,10 +1,10 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/chsh.exp b/test/lib/completions/chsh.exp
index 99262a2..a26ac93 100644
--- a/test/lib/completions/chsh.exp
+++ b/test/lib/completions/chsh.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ci.exp b/test/lib/completions/ci.exp
index 09105ee..15ef2ec 100644
--- a/test/lib/completions/ci.exp
+++ b/test/lib/completions/ci.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/civclient.exp b/test/lib/completions/civclient.exp
index 8159c2b..c004746 100644
--- a/test/lib/completions/civclient.exp
+++ b/test/lib/completions/civclient.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/civserver.exp b/test/lib/completions/civserver.exp
index df45968..3739f50 100644
--- a/test/lib/completions/civserver.exp
+++ b/test/lib/completions/civserver.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cksfv.exp b/test/lib/completions/cksfv.exp
index a40a502..2b9be04 100644
--- a/test/lib/completions/cksfv.exp
+++ b/test/lib/completions/cksfv.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cleanarch.exp b/test/lib/completions/cleanarch.exp
index e3145e8..a5f3bfe 100644
--- a/test/lib/completions/cleanarch.exp
+++ b/test/lib/completions/cleanarch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/clisp.exp b/test/lib/completions/clisp.exp
index 2bc599a..dfbad4f 100644
--- a/test/lib/completions/clisp.exp
+++ b/test/lib/completions/clisp.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/clone_member.exp b/test/lib/completions/clone_member.exp
index 34b4db5..d83d73b 100644
--- a/test/lib/completions/clone_member.exp
+++ b/test/lib/completions/clone_member.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/co.exp b/test/lib/completions/co.exp
index 49fe3a6..215268b 100644
--- a/test/lib/completions/co.exp
+++ b/test/lib/completions/co.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/composite.exp b/test/lib/completions/composite.exp
index e39ce72..aba9af3 100644
--- a/test/lib/completions/composite.exp
+++ b/test/lib/completions/composite.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/config_list.exp b/test/lib/completions/config_list.exp
index 5246c86..2769923 100644
--- a/test/lib/completions/config_list.exp
+++ b/test/lib/completions/config_list.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/configure.exp b/test/lib/completions/configure.exp
index 74afba1..b4399cb 100644
--- a/test/lib/completions/configure.exp
+++ b/test/lib/completions/configure.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/convert.exp b/test/lib/completions/convert.exp
index d8a77e3..0703204 100644
--- a/test/lib/completions/convert.exp
+++ b/test/lib/completions/convert.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cowsay.exp b/test/lib/completions/cowsay.exp
index dfbefe1..382f400 100644
--- a/test/lib/completions/cowsay.exp
+++ b/test/lib/completions/cowsay.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cp.exp b/test/lib/completions/cp.exp
index 9fe4653..703bf26 100644
--- a/test/lib/completions/cp.exp
+++ b/test/lib/completions/cp.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cpio.exp b/test/lib/completions/cpio.exp
index b02f271..93f6f3c 100644
--- a/test/lib/completions/cpio.exp
+++ b/test/lib/completions/cpio.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/createdb.exp b/test/lib/completions/createdb.exp
index 1e5cdbe..aafff1b 100644
--- a/test/lib/completions/createdb.exp
+++ b/test/lib/completions/createdb.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/crontab.exp b/test/lib/completions/crontab.exp
index b7398e6..18e2269 100644
--- a/test/lib/completions/crontab.exp
+++ b/test/lib/completions/crontab.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cryptsetup.exp b/test/lib/completions/cryptsetup.exp
index e94c3ac..4c20bc5 100644
--- a/test/lib/completions/cryptsetup.exp
+++ b/test/lib/completions/cryptsetup.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/csplit.exp b/test/lib/completions/csplit.exp
index 3a66a62..87b89de 100644
--- a/test/lib/completions/csplit.exp
+++ b/test/lib/completions/csplit.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cut.exp b/test/lib/completions/cut.exp
index b9bcf6c..edb558e 100644
--- a/test/lib/completions/cut.exp
+++ b/test/lib/completions/cut.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/cvs.exp b/test/lib/completions/cvs.exp
index 2a26da8..f685394 100644
--- a/test/lib/completions/cvs.exp
+++ b/test/lib/completions/cvs.exp
@@ -1,7 +1,7 @@
proc setup {} {
save_env
assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
-}; # setup()
+}
proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
assert_env_unmodified {
/OLDHOME=/d
}
-}; # teardown()
+}
setup
@@ -27,7 +27,7 @@ send "$cmd\t"
expect {
-re "^$cmd\r\n.*:pserver:.*\r\n/@$cmd:pserver:.*$" { pass "$test" }
default { fail "$test" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/cvsps.exp b/test/lib/completions/cvsps.exp
index 1fd4a0a..def4a11 100644
--- a/test/lib/completions/cvsps.exp
+++ b/test/lib/completions/cvsps.exp
@@ -1,7 +1,7 @@
proc setup {} {
save_env
assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
-}; # setup()
+}
proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
assert_env_unmodified {
/OLDHOME=/d
}
-}; # teardown()
+}
setup
@@ -27,7 +27,7 @@ send "$cmd\t"
expect {
-re "^$cmd\r\n.*:pserver:.*\r\n/@$cmd:pserver:.*$" { pass "$test" }
default { fail "$test" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/date.exp b/test/lib/completions/date.exp
index 9d75f5f..ee970cf 100644
--- a/test/lib/completions/date.exp
+++ b/test/lib/completions/date.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dcop.exp b/test/lib/completions/dcop.exp
index 6ed800c..1e27346 100644
--- a/test/lib/completions/dcop.exp
+++ b/test/lib/completions/dcop.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {dcop} words]} {
assert_complete $words "dcop "
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/dd.exp b/test/lib/completions/dd.exp
index 400dd14..e02e037 100644
--- a/test/lib/completions/dd.exp
+++ b/test/lib/completions/dd.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -24,7 +24,7 @@ expect -ex "$cmd"
expect {
-re "^=$" { pass $test }
-re {^\\=$} { xfail $test }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/df.exp b/test/lib/completions/df.exp
index 487d70a..acf212a 100644
--- a/test/lib/completions/df.exp
+++ b/test/lib/completions/df.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dhclient.exp b/test/lib/completions/dhclient.exp
index 42c14c8..6caff5f 100644
--- a/test/lib/completions/dhclient.exp
+++ b/test/lib/completions/dhclient.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dict.exp b/test/lib/completions/dict.exp
index 32fb498..402e0c5 100644
--- a/test/lib/completions/dict.exp
+++ b/test/lib/completions/dict.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/diff.exp b/test/lib/completions/diff.exp
index c009f64..918bf7f 100644
--- a/test/lib/completions/diff.exp
+++ b/test/lib/completions/diff.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dir.exp b/test/lib/completions/dir.exp
index 6e20d37..c9f61cd 100644
--- a/test/lib/completions/dir.exp
+++ b/test/lib/completions/dir.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/display.exp b/test/lib/completions/display.exp
index 9a9d690..e9fe766 100644
--- a/test/lib/completions/display.exp
+++ b/test/lib/completions/display.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dnsspoof.exp b/test/lib/completions/dnsspoof.exp
index 3223a34..4aefb95 100644
--- a/test/lib/completions/dnsspoof.exp
+++ b/test/lib/completions/dnsspoof.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dpkg-deb.exp b/test/lib/completions/dpkg-deb.exp
index c865661..37ece08 100644
--- a/test/lib/completions/dpkg-deb.exp
+++ b/test/lib/completions/dpkg-deb.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dpkg-reconfigure.exp b/test/lib/completions/dpkg-reconfigure.exp
index 267594b..0212666 100644
--- a/test/lib/completions/dpkg-reconfigure.exp
+++ b/test/lib/completions/dpkg-reconfigure.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dpkg-source.exp b/test/lib/completions/dpkg-source.exp
index a21eff4..a42759b 100644
--- a/test/lib/completions/dpkg-source.exp
+++ b/test/lib/completions/dpkg-source.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dpkg.exp b/test/lib/completions/dpkg.exp
index 2bd1fb6..f358e17 100644
--- a/test/lib/completions/dpkg.exp
+++ b/test/lib/completions/dpkg.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -20,7 +20,7 @@ sync_after_int
# Build list of installed packages
if {[assert_exec {dpkg --get-selections | command grep \[\[:space:\]\]install$ | cut -f1} packages]} {
assert_complete $packages "dpkg -L "
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/dropdb.exp b/test/lib/completions/dropdb.exp
index e78a2ba..8f2d5bf 100644
--- a/test/lib/completions/dropdb.exp
+++ b/test/lib/completions/dropdb.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dselect.exp b/test/lib/completions/dselect.exp
index f625729..634db05 100644
--- a/test/lib/completions/dselect.exp
+++ b/test/lib/completions/dselect.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dsniff.exp b/test/lib/completions/dsniff.exp
index a0cc43a..cb8912b 100644
--- a/test/lib/completions/dsniff.exp
+++ b/test/lib/completions/dsniff.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/du.exp b/test/lib/completions/du.exp
index d1ffa8c..6ddeb9b 100644
--- a/test/lib/completions/du.exp
+++ b/test/lib/completions/du.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/dumpdb.exp b/test/lib/completions/dumpdb.exp
index 240214b..5b617b1 100644
--- a/test/lib/completions/dumpdb.exp
+++ b/test/lib/completions/dumpdb.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/enscript.exp b/test/lib/completions/enscript.exp
index 7fefabd..c859b50 100644
--- a/test/lib/completions/enscript.exp
+++ b/test/lib/completions/enscript.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/env.exp b/test/lib/completions/env.exp
index f03f539..4f21374 100644
--- a/test/lib/completions/env.exp
+++ b/test/lib/completions/env.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {env --help} "" "" "unsupported"]} {
assert_complete_any "env --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/evince.exp b/test/lib/completions/evince.exp
index 22279a2..607c442 100644
--- a/test/lib/completions/evince.exp
+++ b/test/lib/completions/evince.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/expand.exp b/test/lib/completions/expand.exp
index d5cd6b1..76b6eaf 100644
--- a/test/lib/completions/expand.exp
+++ b/test/lib/completions/expand.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {expand --help} "" "" "unsupported"]} {
assert_complete_any "expand --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/filesnarf.exp b/test/lib/completions/filesnarf.exp
index 53cf01e..0375505 100644
--- a/test/lib/completions/filesnarf.exp
+++ b/test/lib/completions/filesnarf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/find.exp b/test/lib/completions/find.exp
index 4b1728d..aab0822 100644
--- a/test/lib/completions/find.exp
+++ b/test/lib/completions/find.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
setup
@@ -50,28 +50,26 @@ sync_after_int
set test "-uid should complete uids"
- # Complete
set cmd "find -uid "
send "$cmd\t"
expect {
-re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
set test "-gid should complete gids"
- # Complete
set cmd "find -gid "
send "$cmd\t"
expect {
-re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/find_member.exp b/test/lib/completions/find_member.exp
index 58fac7d..5567209 100644
--- a/test/lib/completions/find_member.exp
+++ b/test/lib/completions/find_member.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/finger.exp b/test/lib/completions/finger.exp
index 30f2b08..ae86a2d 100644
--- a/test/lib/completions/finger.exp
+++ b/test/lib/completions/finger.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -16,7 +16,7 @@ set test "Tab should complete usernames"
set users {}
foreach u [exec bash -c "compgen -A user"] {
lappend users $u
-}; # foreach
+}
assert_complete $users "finger " $test
@@ -45,9 +45,9 @@ foreach h [get_known_hosts] {
if {$first == $char && [lsearch -exact $hosts "test@$h"] == -1} {
# Prefix hosts with username 'test@'
lappend hosts "test@$h"
- }; # if
- }; # if
-}; # foreach
+ }
+ }
+}
assert_complete $hosts "finger test@$char" $test
diff --git a/test/lib/completions/fmt.exp b/test/lib/completions/fmt.exp
index 2857068..7d3cc17 100644
--- a/test/lib/completions/fmt.exp
+++ b/test/lib/completions/fmt.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {fmt --help} "" "" "unsupported"]} {
assert_complete_any "fmt -"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/fold.exp b/test/lib/completions/fold.exp
index a5230b0..f447f08 100644
--- a/test/lib/completions/fold.exp
+++ b/test/lib/completions/fold.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {fold --help} "" "" "unsupported"]} {
assert_complete_any "fold --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/g++.exp b/test/lib/completions/g++.exp
index 4dc2591..4dbe73f 100644
--- a/test/lib/completions/g++.exp
+++ b/test/lib/completions/g++.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/g4.exp b/test/lib/completions/g4.exp
index 203de06..7d575f1 100644
--- a/test/lib/completions/g4.exp
+++ b/test/lib/completions/g4.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/g77.exp b/test/lib/completions/g77.exp
index 8802aca..e23745b 100644
--- a/test/lib/completions/g77.exp
+++ b/test/lib/completions/g77.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gcc.exp b/test/lib/completions/gcc.exp
index 8e52a12..00097cc 100644
--- a/test/lib/completions/gcc.exp
+++ b/test/lib/completions/gcc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gcj.exp b/test/lib/completions/gcj.exp
index db52d59..cde0770 100644
--- a/test/lib/completions/gcj.exp
+++ b/test/lib/completions/gcj.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gcl.exp b/test/lib/completions/gcl.exp
index 7cead84..1846d0d 100644
--- a/test/lib/completions/gcl.exp
+++ b/test/lib/completions/gcl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gdb.exp b/test/lib/completions/gdb.exp
index 982f087..2e389ed 100644
--- a/test/lib/completions/gdb.exp
+++ b/test/lib/completions/gdb.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/genaliases.exp b/test/lib/completions/genaliases.exp
index 064eb38..bb4d5e0 100644
--- a/test/lib/completions/genaliases.exp
+++ b/test/lib/completions/genaliases.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/getent.exp b/test/lib/completions/getent.exp
index 121f3b3..6500b22 100644
--- a/test/lib/completions/getent.exp
+++ b/test/lib/completions/getent.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gkrellm.exp b/test/lib/completions/gkrellm.exp
index f8b0dd4..009770f 100644
--- a/test/lib/completions/gkrellm.exp
+++ b/test/lib/completions/gkrellm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gmplayer.exp b/test/lib/completions/gmplayer.exp
index d903269..a110cb2 100644
--- a/test/lib/completions/gmplayer.exp
+++ b/test/lib/completions/gmplayer.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gnatmake.exp b/test/lib/completions/gnatmake.exp
index 902aa06..bad4da3 100644
--- a/test/lib/completions/gnatmake.exp
+++ b/test/lib/completions/gnatmake.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gpc.exp b/test/lib/completions/gpc.exp
index 6c4d038..71eddac 100644
--- a/test/lib/completions/gpc.exp
+++ b/test/lib/completions/gpc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gperf.exp b/test/lib/completions/gperf.exp
index aa24333..1cf7767 100644
--- a/test/lib/completions/gperf.exp
+++ b/test/lib/completions/gperf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gpg.exp b/test/lib/completions/gpg.exp
index 29fd224..ea6805f 100644
--- a/test/lib/completions/gpg.exp
+++ b/test/lib/completions/gpg.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gprof.exp b/test/lib/completions/gprof.exp
index 592786a..996a1ef 100644
--- a/test/lib/completions/gprof.exp
+++ b/test/lib/completions/gprof.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {gprof --help} "" "" "unsupported"]} {
assert_complete_any "gprof --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/grep.exp b/test/lib/completions/grep.exp
index 3814df7..c94ae72 100644
--- a/test/lib/completions/grep.exp
+++ b/test/lib/completions/grep.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/grub.exp b/test/lib/completions/grub.exp
index 9578e78..b88d1f2 100644
--- a/test/lib/completions/grub.exp
+++ b/test/lib/completions/grub.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/gzip.exp b/test/lib/completions/gzip.exp
index f212c61..32acf42 100644
--- a/test/lib/completions/gzip.exp
+++ b/test/lib/completions/gzip.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -19,7 +19,7 @@ expect {
-re "^$cmd\r\n.*$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/hcitool.exp b/test/lib/completions/hcitool.exp
index 9283adf..e6ae003 100644
--- a/test/lib/completions/hcitool.exp
+++ b/test/lib/completions/hcitool.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/head.exp b/test/lib/completions/head.exp
index 0d4f6a2..7edb8a1 100644
--- a/test/lib/completions/head.exp
+++ b/test/lib/completions/head.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {head --help} "" "" "unsupported"]} {
assert_complete_any "head --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/hping2.exp b/test/lib/completions/hping2.exp
index 03af8c9..8919626 100644
--- a/test/lib/completions/hping2.exp
+++ b/test/lib/completions/hping2.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/iconv.exp b/test/lib/completions/iconv.exp
index 420e923..dcce330 100644
--- a/test/lib/completions/iconv.exp
+++ b/test/lib/completions/iconv.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/id.exp b/test/lib/completions/id.exp
index 155af52..b03ee72 100644
--- a/test/lib/completions/id.exp
+++ b/test/lib/completions/id.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/identify.exp b/test/lib/completions/identify.exp
index 8f38ae4..3347c5c 100644
--- a/test/lib/completions/identify.exp
+++ b/test/lib/completions/identify.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ifdown.exp b/test/lib/completions/ifdown.exp
index 68225bb..7849f3f 100644
--- a/test/lib/completions/ifdown.exp
+++ b/test/lib/completions/ifdown.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ifup.exp b/test/lib/completions/ifup.exp
index 9d71717..2c1c010 100644
--- a/test/lib/completions/ifup.exp
+++ b/test/lib/completions/ifup.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/indent.exp b/test/lib/completions/indent.exp
index e8fc32b..5c5bb1c 100644
--- a/test/lib/completions/indent.exp
+++ b/test/lib/completions/indent.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/info.exp b/test/lib/completions/info.exp
index ed769f1..e7c79e6 100644
--- a/test/lib/completions/info.exp
+++ b/test/lib/completions/info.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/inject.exp b/test/lib/completions/inject.exp
index 7c09314..4f95be2 100644
--- a/test/lib/completions/inject.exp
+++ b/test/lib/completions/inject.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/insmod.exp b/test/lib/completions/insmod.exp
index 8e83f0b..a312c89 100644
--- a/test/lib/completions/insmod.exp
+++ b/test/lib/completions/insmod.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/invoke-rc.d.exp b/test/lib/completions/invoke-rc.d.exp
index 4dc9f1d..d217d17 100644
--- a/test/lib/completions/invoke-rc.d.exp
+++ b/test/lib/completions/invoke-rc.d.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ipsec.exp b/test/lib/completions/ipsec.exp
index 15617a1..74ef638 100644
--- a/test/lib/completions/ipsec.exp
+++ b/test/lib/completions/ipsec.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ipv6calc.exp b/test/lib/completions/ipv6calc.exp
index 74ce95f..42201f0 100644
--- a/test/lib/completions/ipv6calc.exp
+++ b/test/lib/completions/ipv6calc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/irb.exp b/test/lib/completions/irb.exp
index 81bea6d..720edfd 100644
--- a/test/lib/completions/irb.exp
+++ b/test/lib/completions/irb.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/isql.exp b/test/lib/completions/isql.exp
index 87e16bc..ca40fac 100644
--- a/test/lib/completions/isql.exp
+++ b/test/lib/completions/isql.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/ODBCINI=/d}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/iwconfig.exp b/test/lib/completions/iwconfig.exp
index f09719d..82ae11f 100644
--- a/test/lib/completions/iwconfig.exp
+++ b/test/lib/completions/iwconfig.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/iwlist.exp b/test/lib/completions/iwlist.exp
index 80a2c36..43c919e 100644
--- a/test/lib/completions/iwlist.exp
+++ b/test/lib/completions/iwlist.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/iwpriv.exp b/test/lib/completions/iwpriv.exp
index f3102cc..86b1ee9 100644
--- a/test/lib/completions/iwpriv.exp
+++ b/test/lib/completions/iwpriv.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/iwspy.exp b/test/lib/completions/iwspy.exp
index 5fa0bee..2894ca4 100644
--- a/test/lib/completions/iwspy.exp
+++ b/test/lib/completions/iwspy.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/jar.exp b/test/lib/completions/jar.exp
index 0e11f68..d2cb476 100644
--- a/test/lib/completions/jar.exp
+++ b/test/lib/completions/jar.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/jarsigner.exp b/test/lib/completions/jarsigner.exp
index 075e026..7ea7cb2 100644
--- a/test/lib/completions/jarsigner.exp
+++ b/test/lib/completions/jarsigner.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index 14610b2..16b6005 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -1,12 +1,12 @@
proc setup {} {
assert_bash_exec {CLASSPATH=$TESTDIR/fixtures/java/a:$TESTDIR/fixtures/java/bashcomp.jar}
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/javac.exp b/test/lib/completions/javac.exp
index 6013de1..948fe8c 100644
--- a/test/lib/completions/javac.exp
+++ b/test/lib/completions/javac.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/javadoc.exp b/test/lib/completions/javadoc.exp
index 40c922c..0af8a3d 100644
--- a/test/lib/completions/javadoc.exp
+++ b/test/lib/completions/javadoc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/k3b.exp b/test/lib/completions/k3b.exp
index 86942d6..cde14b8 100644
--- a/test/lib/completions/k3b.exp
+++ b/test/lib/completions/k3b.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/kdvi.exp b/test/lib/completions/kdvi.exp
index 0196049..c7881da 100644
--- a/test/lib/completions/kdvi.exp
+++ b/test/lib/completions/kdvi.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/kill.exp b/test/lib/completions/kill.exp
index ca02650..1e80fe6 100644
--- a/test/lib/completions/kill.exp
+++ b/test/lib/completions/kill.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/killall.exp b/test/lib/completions/killall.exp
index 763c8e7..ae8b3d6 100644
--- a/test/lib/completions/killall.exp
+++ b/test/lib/completions/killall.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/kldload.exp b/test/lib/completions/kldload.exp
index 0493a10..a1d87c9 100644
--- a/test/lib/completions/kldload.exp
+++ b/test/lib/completions/kldload.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/kldunload.exp b/test/lib/completions/kldunload.exp
index 192159a..476c510 100644
--- a/test/lib/completions/kldunload.exp
+++ b/test/lib/completions/kldunload.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/kpdf.exp b/test/lib/completions/kpdf.exp
index 010abcf..4066c9c 100644
--- a/test/lib/completions/kpdf.exp
+++ b/test/lib/completions/kpdf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/kplayer.exp b/test/lib/completions/kplayer.exp
index 34c9b3b..4fdfa67 100644
--- a/test/lib/completions/kplayer.exp
+++ b/test/lib/completions/kplayer.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/larch.exp b/test/lib/completions/larch.exp
index 076016f..cefcbe0 100644
--- a/test/lib/completions/larch.exp
+++ b/test/lib/completions/larch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ld.exp b/test/lib/completions/ld.exp
index 6037799..ee660fc 100644
--- a/test/lib/completions/ld.exp
+++ b/test/lib/completions/ld.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ldd.exp b/test/lib/completions/ldd.exp
index e45d1df..1c3239c 100644
--- a/test/lib/completions/ldd.exp
+++ b/test/lib/completions/ldd.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/less.exp b/test/lib/completions/less.exp
index 269c9b5..78d6ef1 100644
--- a/test/lib/completions/less.exp
+++ b/test/lib/completions/less.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lftp.exp b/test/lib/completions/lftp.exp
index a49a193..9fcc9a6 100644
--- a/test/lib/completions/lftp.exp
+++ b/test/lib/completions/lftp.exp
@@ -1,12 +1,12 @@
proc setup {} {
assert_bash_exec {HOME=$TESTDIR/fixtures/lftp}
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lftpget.exp b/test/lib/completions/lftpget.exp
index 7d80216..0eadb6e 100644
--- a/test/lib/completions/lftpget.exp
+++ b/test/lib/completions/lftpget.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lilo.exp b/test/lib/completions/lilo.exp
index 505a147..36ea2c6 100644
--- a/test/lib/completions/lilo.exp
+++ b/test/lib/completions/lilo.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/links.exp b/test/lib/completions/links.exp
index 9f4896a..4124e2f 100644
--- a/test/lib/completions/links.exp
+++ b/test/lib/completions/links.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lisp.exp b/test/lib/completions/lisp.exp
index 2166362..5131b45 100644
--- a/test/lib/completions/lisp.exp
+++ b/test/lib/completions/lisp.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/list_admins.exp b/test/lib/completions/list_admins.exp
index e1c9c4d..3b41213 100644
--- a/test/lib/completions/list_admins.exp
+++ b/test/lib/completions/list_admins.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/list_lists.exp b/test/lib/completions/list_lists.exp
index 789ab1a..a62dca2 100644
--- a/test/lib/completions/list_lists.exp
+++ b/test/lib/completions/list_lists.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/list_members.exp b/test/lib/completions/list_members.exp
index c93b53d..8c74cdf 100644
--- a/test/lib/completions/list_members.exp
+++ b/test/lib/completions/list_members.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/list_owners.exp b/test/lib/completions/list_owners.exp
index c96e022..65e3ba8 100644
--- a/test/lib/completions/list_owners.exp
+++ b/test/lib/completions/list_owners.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ln.exp b/test/lib/completions/ln.exp
index 3478607..6140502 100644
--- a/test/lib/completions/ln.exp
+++ b/test/lib/completions/ln.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/look.exp b/test/lib/completions/look.exp
index 53a3c46..8f93db2 100644
--- a/test/lib/completions/look.exp
+++ b/test/lib/completions/look.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {look foo | grep ^foo} words]} {
assert_complete $words "look foo"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index db2d41d..171f6e1 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {ls --help} "" "" "unsupported"]} {
assert_complete_any "ls --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/lvchange.exp b/test/lib/completions/lvchange.exp
index ec3886b..6587a26 100644
--- a/test/lib/completions/lvchange.exp
+++ b/test/lib/completions/lvchange.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvcreate.exp b/test/lib/completions/lvcreate.exp
index 46dceb7..91cb0d8 100644
--- a/test/lib/completions/lvcreate.exp
+++ b/test/lib/completions/lvcreate.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvdisplay.exp b/test/lib/completions/lvdisplay.exp
index 5a01a0e..6fa9c29 100644
--- a/test/lib/completions/lvdisplay.exp
+++ b/test/lib/completions/lvdisplay.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvextend.exp b/test/lib/completions/lvextend.exp
index 24a6385..ded3469 100644
--- a/test/lib/completions/lvextend.exp
+++ b/test/lib/completions/lvextend.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvm.exp b/test/lib/completions/lvm.exp
index 1c67825..91fe0dc 100644
--- a/test/lib/completions/lvm.exp
+++ b/test/lib/completions/lvm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvmdiskscan.exp b/test/lib/completions/lvmdiskscan.exp
index 27e566d..6553865 100644
--- a/test/lib/completions/lvmdiskscan.exp
+++ b/test/lib/completions/lvmdiskscan.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvreduce.exp b/test/lib/completions/lvreduce.exp
index edd5150..e2708f8 100644
--- a/test/lib/completions/lvreduce.exp
+++ b/test/lib/completions/lvreduce.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvremove.exp b/test/lib/completions/lvremove.exp
index 1cd6315..8ca1517 100644
--- a/test/lib/completions/lvremove.exp
+++ b/test/lib/completions/lvremove.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvrename.exp b/test/lib/completions/lvrename.exp
index 5162422..17179ce 100644
--- a/test/lib/completions/lvrename.exp
+++ b/test/lib/completions/lvrename.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvresize.exp b/test/lib/completions/lvresize.exp
index 830b9ab..2b3e104 100644
--- a/test/lib/completions/lvresize.exp
+++ b/test/lib/completions/lvresize.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvs.exp b/test/lib/completions/lvs.exp
index 8b239f5..e531f7e 100644
--- a/test/lib/completions/lvs.exp
+++ b/test/lib/completions/lvs.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lvscan.exp b/test/lib/completions/lvscan.exp
index 841fd0e..7b09e5e 100644
--- a/test/lib/completions/lvscan.exp
+++ b/test/lib/completions/lvscan.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lzma.exp b/test/lib/completions/lzma.exp
index 79d7885..56364d1 100644
--- a/test/lib/completions/lzma.exp
+++ b/test/lib/completions/lzma.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/lzop.exp b/test/lib/completions/lzop.exp
index c33e814..a7d3da2 100644
--- a/test/lib/completions/lzop.exp
+++ b/test/lib/completions/lzop.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/m4.exp b/test/lib/completions/m4.exp
index 2cc884b..334132d 100644
--- a/test/lib/completions/m4.exp
+++ b/test/lib/completions/m4.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {m4 --help} "" "" "unsupported"]} {
assert_complete_any "m4 --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/macof.exp b/test/lib/completions/macof.exp
index e21b1e7..873ae1d 100644
--- a/test/lib/completions/macof.exp
+++ b/test/lib/completions/macof.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mailmanctl.exp b/test/lib/completions/mailmanctl.exp
index a69b765..2924806 100644
--- a/test/lib/completions/mailmanctl.exp
+++ b/test/lib/completions/mailmanctl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mailsnarf.exp b/test/lib/completions/mailsnarf.exp
index df9981b..9fb937f 100644
--- a/test/lib/completions/mailsnarf.exp
+++ b/test/lib/completions/mailsnarf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/make.exp b/test/lib/completions/make.exp
index 90b9e68..64a393d 100644
--- a/test/lib/completions/make.exp
+++ b/test/lib/completions/make.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/man.exp b/test/lib/completions/man.exp
index 62c14c8..47a6575 100644
--- a/test/lib/completions/man.exp
+++ b/test/lib/completions/man.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mc.exp b/test/lib/completions/mc.exp
index 866161b..eb97246 100644
--- a/test/lib/completions/mc.exp
+++ b/test/lib/completions/mc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mcrypt.exp b/test/lib/completions/mcrypt.exp
index bfc5d2d..525ccbc 100644
--- a/test/lib/completions/mcrypt.exp
+++ b/test/lib/completions/mcrypt.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/md5sum.exp b/test/lib/completions/md5sum.exp
index 25290b5..54ed641 100644
--- a/test/lib/completions/md5sum.exp
+++ b/test/lib/completions/md5sum.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mdecrypt.exp b/test/lib/completions/mdecrypt.exp
index 4e49ae1..8d9d9f5 100644
--- a/test/lib/completions/mdecrypt.exp
+++ b/test/lib/completions/mdecrypt.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mencoder.exp b/test/lib/completions/mencoder.exp
index 169dcb7..db29f66 100644
--- a/test/lib/completions/mencoder.exp
+++ b/test/lib/completions/mencoder.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/minicom.exp b/test/lib/completions/minicom.exp
index 935502f..dfc96c0 100644
--- a/test/lib/completions/minicom.exp
+++ b/test/lib/completions/minicom.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mkdir.exp b/test/lib/completions/mkdir.exp
index 43dfec7..a933356 100644
--- a/test/lib/completions/mkdir.exp
+++ b/test/lib/completions/mkdir.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mkfifo.exp b/test/lib/completions/mkfifo.exp
index c6343f8..59412a2 100644
--- a/test/lib/completions/mkfifo.exp
+++ b/test/lib/completions/mkfifo.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mkinitrd.exp b/test/lib/completions/mkinitrd.exp
index cfb316e..007f278 100644
--- a/test/lib/completions/mkinitrd.exp
+++ b/test/lib/completions/mkinitrd.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mkisofs.exp b/test/lib/completions/mkisofs.exp
index ad24ea0..98780b1 100644
--- a/test/lib/completions/mkisofs.exp
+++ b/test/lib/completions/mkisofs.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -25,7 +25,7 @@ expect {
-re "^$cmd\r\n\\d+.*$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
@@ -39,7 +39,7 @@ expect {
-re "^$cmd\r\n\\d+.*$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/mknod.exp b/test/lib/completions/mknod.exp
index 2c58cad..145f453 100644
--- a/test/lib/completions/mknod.exp
+++ b/test/lib/completions/mknod.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mmsitepass.exp b/test/lib/completions/mmsitepass.exp
index d69fa20..4dde214 100644
--- a/test/lib/completions/mmsitepass.exp
+++ b/test/lib/completions/mmsitepass.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/module.exp b/test/lib/completions/module.exp
index a34667d..5e36a6d 100644
--- a/test/lib/completions/module.exp
+++ b/test/lib/completions/module.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mogrify.exp b/test/lib/completions/mogrify.exp
index ef7e18e..84ceeff 100644
--- a/test/lib/completions/mogrify.exp
+++ b/test/lib/completions/mogrify.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/montage.exp b/test/lib/completions/montage.exp
index 736609a..4d85e1a 100644
--- a/test/lib/completions/montage.exp
+++ b/test/lib/completions/montage.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mplayer.exp b/test/lib/completions/mplayer.exp
index 69e5d97..9230a86 100644
--- a/test/lib/completions/mplayer.exp
+++ b/test/lib/completions/mplayer.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/msgsnarf.exp b/test/lib/completions/msgsnarf.exp
index 74f458f..c542e33 100644
--- a/test/lib/completions/msgsnarf.exp
+++ b/test/lib/completions/msgsnarf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mtx.exp b/test/lib/completions/mtx.exp
index a518d79..1de1526 100644
--- a/test/lib/completions/mtx.exp
+++ b/test/lib/completions/mtx.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mutt.exp b/test/lib/completions/mutt.exp
index 6c727da..91eb245 100644
--- a/test/lib/completions/mutt.exp
+++ b/test/lib/completions/mutt.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/muttng.exp b/test/lib/completions/muttng.exp
index 25a474a..3223912 100644
--- a/test/lib/completions/muttng.exp
+++ b/test/lib/completions/muttng.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mv.exp b/test/lib/completions/mv.exp
index f2576df..d65c486 100644
--- a/test/lib/completions/mv.exp
+++ b/test/lib/completions/mv.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/mysqladmin.exp b/test/lib/completions/mysqladmin.exp
index 7638158..ae9b8ce 100644
--- a/test/lib/completions/mysqladmin.exp
+++ b/test/lib/completions/mysqladmin.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ncftp.exp b/test/lib/completions/ncftp.exp
index ad71f22..52d7075 100644
--- a/test/lib/completions/ncftp.exp
+++ b/test/lib/completions/ncftp.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/netstat.exp b/test/lib/completions/netstat.exp
index 0e6414d..e4ef676 100644
--- a/test/lib/completions/netstat.exp
+++ b/test/lib/completions/netstat.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/newlist.exp b/test/lib/completions/newlist.exp
index bebf600..0696ec5 100644
--- a/test/lib/completions/newlist.exp
+++ b/test/lib/completions/newlist.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/nl.exp b/test/lib/completions/nl.exp
index 02076df..b7255ac 100644
--- a/test/lib/completions/nl.exp
+++ b/test/lib/completions/nl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/nm.exp b/test/lib/completions/nm.exp
index 551f49e..9ce73d4 100644
--- a/test/lib/completions/nm.exp
+++ b/test/lib/completions/nm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ntpdate.exp b/test/lib/completions/ntpdate.exp
index 6a6456f..7a7dd71 100644
--- a/test/lib/completions/ntpdate.exp
+++ b/test/lib/completions/ntpdate.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/objcopy.exp b/test/lib/completions/objcopy.exp
index acb6539..29be7e6 100644
--- a/test/lib/completions/objcopy.exp
+++ b/test/lib/completions/objcopy.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/objdump.exp b/test/lib/completions/objdump.exp
index 5eec35d..c1f62e3 100644
--- a/test/lib/completions/objdump.exp
+++ b/test/lib/completions/objdump.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/od.exp b/test/lib/completions/od.exp
index 5838218..e2712d1 100644
--- a/test/lib/completions/od.exp
+++ b/test/lib/completions/od.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/openssl.exp b/test/lib/completions/openssl.exp
index 651e5e6..25fc136 100644
--- a/test/lib/completions/openssl.exp
+++ b/test/lib/completions/openssl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -19,7 +19,7 @@ expect {
-re "^$cmd\r\n.*$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/p4.exp b/test/lib/completions/p4.exp
index 369d2c6..20d8fb6 100644
--- a/test/lib/completions/p4.exp
+++ b/test/lib/completions/p4.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pack200.exp b/test/lib/completions/pack200.exp
index f96eff1..537bf32 100644
--- a/test/lib/completions/pack200.exp
+++ b/test/lib/completions/pack200.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/paste.exp b/test/lib/completions/paste.exp
index 3a4e93b..224d9dd 100644
--- a/test/lib/completions/paste.exp
+++ b/test/lib/completions/paste.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/patch.exp b/test/lib/completions/patch.exp
index a44fa13..07e88f1 100644
--- a/test/lib/completions/patch.exp
+++ b/test/lib/completions/patch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 2199c99..e02bd45 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index b3ff83b..d4461df 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -29,7 +29,7 @@ expect {
-re "perldoc File::File::" { fail "$test" }
-re /@ { unresolved "$test" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/pgrep.exp b/test/lib/completions/pgrep.exp
index 63143ac..c27c4f2 100644
--- a/test/lib/completions/pgrep.exp
+++ b/test/lib/completions/pgrep.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pine.exp b/test/lib/completions/pine.exp
index 0a0c3f4..622bf06 100644
--- a/test/lib/completions/pine.exp
+++ b/test/lib/completions/pine.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ping.exp b/test/lib/completions/ping.exp
index b600849..3e41996 100644
--- a/test/lib/completions/ping.exp
+++ b/test/lib/completions/ping.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pkg-config.exp b/test/lib/completions/pkg-config.exp
index 477dba0..adf9a30 100644
--- a/test/lib/completions/pkg-config.exp
+++ b/test/lib/completions/pkg-config.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pkg_deinstall.exp b/test/lib/completions/pkg_deinstall.exp
index 8f3d8c3..e61d0ce 100644
--- a/test/lib/completions/pkg_deinstall.exp
+++ b/test/lib/completions/pkg_deinstall.exp
@@ -1,12 +1,12 @@
proc setup {} {
assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pkg_delete.exp b/test/lib/completions/pkg_delete.exp
index b0c1a2a..37ce403 100644
--- a/test/lib/completions/pkg_delete.exp
+++ b/test/lib/completions/pkg_delete.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pkg_info.exp b/test/lib/completions/pkg_info.exp
index 3f253cc..ad8ed84 100644
--- a/test/lib/completions/pkg_info.exp
+++ b/test/lib/completions/pkg_info.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pkill.exp b/test/lib/completions/pkill.exp
index 0333fc9..6faddfc 100644
--- a/test/lib/completions/pkill.exp
+++ b/test/lib/completions/pkill.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/portinstall.exp b/test/lib/completions/portinstall.exp
index d70f5db..9f44e96 100644
--- a/test/lib/completions/portinstall.exp
+++ b/test/lib/completions/portinstall.exp
@@ -1,13 +1,13 @@
proc setup {} {
assert_bash_exec {PORTSDIR=fixtures/pkgtools/ports ; sed -e s,PORTSDIR,$PORTSDIR,g $PORTSDIR/INDEX.dist > $PORTSDIR/INDEX ; cp $PORTSDIR/INDEX $PORTSDIR/INDEX-5}
save_env
-}; # setup()
+}
proc teardown {} {
assert_bash_exec {rm fixtures/pkgtools/ports/INDEX fixtures/pkgtools/ports/INDEX-5}
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/portupgrade.exp b/test/lib/completions/portupgrade.exp
index cb58392..62b5789 100644
--- a/test/lib/completions/portupgrade.exp
+++ b/test/lib/completions/portupgrade.exp
@@ -1,12 +1,12 @@
proc setup {} {
assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/povray.exp b/test/lib/completions/povray.exp
index 1efeedd..30d58e4 100644
--- a/test/lib/completions/povray.exp
+++ b/test/lib/completions/povray.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pr.exp b/test/lib/completions/pr.exp
index 5d7a96c..478017b 100644
--- a/test/lib/completions/pr.exp
+++ b/test/lib/completions/pr.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/psql.exp b/test/lib/completions/psql.exp
index 56d5666..3dbffaf 100644
--- a/test/lib/completions/psql.exp
+++ b/test/lib/completions/psql.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ptx.exp b/test/lib/completions/ptx.exp
index 2defe04..220243c 100644
--- a/test/lib/completions/ptx.exp
+++ b/test/lib/completions/ptx.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvchange.exp b/test/lib/completions/pvchange.exp
index fd4b73d..a43ae9c 100644
--- a/test/lib/completions/pvchange.exp
+++ b/test/lib/completions/pvchange.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvcreate.exp b/test/lib/completions/pvcreate.exp
index 47cebf7..6bc9d4e 100644
--- a/test/lib/completions/pvcreate.exp
+++ b/test/lib/completions/pvcreate.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvdisplay.exp b/test/lib/completions/pvdisplay.exp
index 151064c..b9db558 100644
--- a/test/lib/completions/pvdisplay.exp
+++ b/test/lib/completions/pvdisplay.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvmove.exp b/test/lib/completions/pvmove.exp
index 81c05e9..24d1700 100644
--- a/test/lib/completions/pvmove.exp
+++ b/test/lib/completions/pvmove.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvremove.exp b/test/lib/completions/pvremove.exp
index dd145bf..1febcf3 100644
--- a/test/lib/completions/pvremove.exp
+++ b/test/lib/completions/pvremove.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvs.exp b/test/lib/completions/pvs.exp
index 6e5527e..e50501a 100644
--- a/test/lib/completions/pvs.exp
+++ b/test/lib/completions/pvs.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/pvscan.exp b/test/lib/completions/pvscan.exp
index e92cdbe..d3b8ad3 100644
--- a/test/lib/completions/pvscan.exp
+++ b/test/lib/completions/pvscan.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/python.exp b/test/lib/completions/python.exp
index c9d70b4..57520cd 100644
--- a/test/lib/completions/python.exp
+++ b/test/lib/completions/python.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/qrunner.exp b/test/lib/completions/qrunner.exp
index b8fcf19..0dec16c 100644
--- a/test/lib/completions/qrunner.exp
+++ b/test/lib/completions/qrunner.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/querybts.exp b/test/lib/completions/querybts.exp
index dc75cd6..4ed09d8 100644
--- a/test/lib/completions/querybts.exp
+++ b/test/lib/completions/querybts.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rcs.exp b/test/lib/completions/rcs.exp
index 19ae4d5..781ac37 100644
--- a/test/lib/completions/rcs.exp
+++ b/test/lib/completions/rcs.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rcsdiff.exp b/test/lib/completions/rcsdiff.exp
index 8383cdb..23b009c 100644
--- a/test/lib/completions/rcsdiff.exp
+++ b/test/lib/completions/rcsdiff.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rdict.exp b/test/lib/completions/rdict.exp
index aa13261..5d6ad84 100644
--- a/test/lib/completions/rdict.exp
+++ b/test/lib/completions/rdict.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/readelf.exp b/test/lib/completions/readelf.exp
index a084a41..c2d5ee5 100644
--- a/test/lib/completions/readelf.exp
+++ b/test/lib/completions/readelf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/readonly.exp b/test/lib/completions/readonly.exp
index 84be3c9..cf64ca0 100644
--- a/test/lib/completions/readonly.exp
+++ b/test/lib/completions/readonly.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/remove_members.exp b/test/lib/completions/remove_members.exp
index 63d6a70..59f7b6c 100644
--- a/test/lib/completions/remove_members.exp
+++ b/test/lib/completions/remove_members.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/removepkg.exp b/test/lib/completions/removepkg.exp
index 7cf9880..882f1e7 100644
--- a/test/lib/completions/removepkg.exp
+++ b/test/lib/completions/removepkg.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/renice.exp b/test/lib/completions/renice.exp
index c91e021..fdc859b 100644
--- a/test/lib/completions/renice.exp
+++ b/test/lib/completions/renice.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -19,7 +19,7 @@ expect {
-re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
@@ -33,7 +33,7 @@ expect {
-re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int
diff --git a/test/lib/completions/reportbug.exp b/test/lib/completions/reportbug.exp
index 1f66df2..660778f 100644
--- a/test/lib/completions/reportbug.exp
+++ b/test/lib/completions/reportbug.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ri.exp b/test/lib/completions/ri.exp
index 160dc9a..cd138ea 100644
--- a/test/lib/completions/ri.exp
+++ b/test/lib/completions/ri.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rlog.exp b/test/lib/completions/rlog.exp
index cbc0685..87984a8 100644
--- a/test/lib/completions/rlog.exp
+++ b/test/lib/completions/rlog.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rm.exp b/test/lib/completions/rm.exp
index ae670e8..f764a8e 100644
--- a/test/lib/completions/rm.exp
+++ b/test/lib/completions/rm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rmdir.exp b/test/lib/completions/rmdir.exp
index 2b23a9c..cc60476 100644
--- a/test/lib/completions/rmdir.exp
+++ b/test/lib/completions/rmdir.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rmlist.exp b/test/lib/completions/rmlist.exp
index 91519ee..d530d11 100644
--- a/test/lib/completions/rmlist.exp
+++ b/test/lib/completions/rmlist.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rpcdebug.exp b/test/lib/completions/rpcdebug.exp
index 8629c94..7f1a1c2 100644
--- a/test/lib/completions/rpcdebug.exp
+++ b/test/lib/completions/rpcdebug.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rpm.exp b/test/lib/completions/rpm.exp
index 3ed154a..82ab28d 100644
--- a/test/lib/completions/rpm.exp
+++ b/test/lib/completions/rpm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -20,7 +20,7 @@ sync_after_int
# Build list of installed packages
if {[assert_exec {rpm -qa --qf=%\{NAME\}\n | sort -u} packages]} {
assert_complete $packages "rpm -q "
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/rsync.exp b/test/lib/completions/rsync.exp
index fb301a3..221d090 100644
--- a/test/lib/completions/rsync.exp
+++ b/test/lib/completions/rsync.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/rtcwake.exp b/test/lib/completions/rtcwake.exp
index 0b9a974..21c05ea 100644
--- a/test/lib/completions/rtcwake.exp
+++ b/test/lib/completions/rtcwake.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sbcl-mt.exp b/test/lib/completions/sbcl-mt.exp
index 45e81f7..d328fec 100644
--- a/test/lib/completions/sbcl-mt.exp
+++ b/test/lib/completions/sbcl-mt.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sbcl.exp b/test/lib/completions/sbcl.exp
index b68b2dc..c6f908f 100644
--- a/test/lib/completions/sbcl.exp
+++ b/test/lib/completions/sbcl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index efe2b68..e1f7336 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -1,6 +1,6 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
/BASH_SOURCE=/d
/OLDPWD=/d
}
-}; # teardown()
+}
setup
@@ -31,7 +31,7 @@ if {
# in `$HOME/.ssh/config' or `/etc/ssh_config'
set host_pwd ""
unsupported $test
-}; # if
+}
# Try completion
@@ -41,7 +41,7 @@ sync_after_tab
expect {
-re "^$cmd$host_pwd.*$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-}; # expect
+}
sync_after_int
@@ -56,7 +56,7 @@ set test "Tab should complete known-hosts"
set expected {}
foreach host [get_hosts] {
lappend expected "$host:"
-}; # foreach
+}
lappend expected doo: gee: hus: ike:
# Append local filenames
lappend expected config known_hosts "spaced\\ \\ conf"
@@ -76,7 +76,7 @@ expect {
-re "^$cmd\r\n.*\r\n/@" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
@@ -88,7 +88,7 @@ set test "Config file containing space should work"
set expected {}
foreach host [get_hosts] {
lappend expected "$host:"
-}; # foreach
+}
# Hosts `gee', `hus' and `jar' are defined in "./fixtures/scp/spaced conf"
# Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
lappend expected doo: gee: hus: ike: jar:
@@ -105,12 +105,12 @@ if {[match_items [lsort -unique $expected] $test]} {
expect {
-re $prompt { pass "$test" }
-re eof { unresolved "eof" }
- }; # expect
+ }
} else {
# Expected failure (known bug) because of bash-4 bug in quoted words:
# http://www.mail-archive.com/bug-bash@gnu.org/msg06095.html
if {[lindex $::BASH_VERSINFO 0] >= 4} {xfail "$test"} {fail "$test"}
-}; # if
+}
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
diff --git a/test/lib/completions/screen.exp b/test/lib/completions/screen.exp
index 985862c..a1a2013 100644
--- a/test/lib/completions/screen.exp
+++ b/test/lib/completions/screen.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
setup
@@ -40,7 +40,7 @@ expect {
}
-re $prompt { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
diff --git a/test/lib/completions/sed.exp b/test/lib/completions/sed.exp
index 8764cfb..dd480a6 100644
--- a/test/lib/completions/sed.exp
+++ b/test/lib/completions/sed.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {sed --help} "" "" "unsupported"]} {
assert_complete_any "sed --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/seq.exp b/test/lib/completions/seq.exp
index b5333ef..6e5ef8d 100644
--- a/test/lib/completions/seq.exp
+++ b/test/lib/completions/seq.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/service.exp b/test/lib/completions/service.exp
index 917c5dc..f3cf735 100644
--- a/test/lib/completions/service.exp
+++ b/test/lib/completions/service.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/set.exp b/test/lib/completions/set.exp
index 2b2d40e..c14ecff 100644
--- a/test/lib/completions/set.exp
+++ b/test/lib/completions/set.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 24c37cb..7a197c7 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -1,6 +1,6 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
/BASH_SOURCE=/d
/OLDPWD=/d
}
-}; # teardown()
+}
setup
@@ -36,7 +36,7 @@ expect {
-re "^$cmd\r\n.*\r\n/@" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
@@ -69,7 +69,7 @@ expect {
-re "aced conf" { xfail "$test" }
-re $prompt { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
diff --git a/test/lib/completions/sha1sum.exp b/test/lib/completions/sha1sum.exp
index 1751908..c598304 100644
--- a/test/lib/completions/sha1sum.exp
+++ b/test/lib/completions/sha1sum.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/shar.exp b/test/lib/completions/shar.exp
index 7ace9d6..604a203 100644
--- a/test/lib/completions/shar.exp
+++ b/test/lib/completions/shar.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sitecopy.exp b/test/lib/completions/sitecopy.exp
index 49b7891..7e0c87f 100644
--- a/test/lib/completions/sitecopy.exp
+++ b/test/lib/completions/sitecopy.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/smartctl.exp b/test/lib/completions/smartctl.exp
index a9eeb95..2491939 100644
--- a/test/lib/completions/smartctl.exp
+++ b/test/lib/completions/smartctl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/snownews.exp b/test/lib/completions/snownews.exp
index 7502e58..c8ad674 100644
--- a/test/lib/completions/snownews.exp
+++ b/test/lib/completions/snownews.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sort.exp b/test/lib/completions/sort.exp
index 20516cc..a130bbc 100644
--- a/test/lib/completions/sort.exp
+++ b/test/lib/completions/sort.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/split.exp b/test/lib/completions/split.exp
index b74da36..e13df49 100644
--- a/test/lib/completions/split.exp
+++ b/test/lib/completions/split.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {split --help} "" "" "unsupported"]} {
assert_complete_any "split --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/spovray.exp b/test/lib/completions/spovray.exp
index 30d8185..2b2c33d 100644
--- a/test/lib/completions/spovray.exp
+++ b/test/lib/completions/spovray.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index 91955c1..7a511ea 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -1,6 +1,6 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
/BASH_SOURCE=/d
/OLDPWD=/d
}
-}; # teardown()
+}
setup
@@ -27,7 +27,7 @@ expect {
-re $expected { pass "$test" }
-re $prompt { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
@@ -45,7 +45,7 @@ expect {
-re "^$cmd\r\n.*\r\n/@" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
@@ -82,7 +82,7 @@ expect {
-re "aced conf" { xfail "$test" }
-re $prompt { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
diff --git a/test/lib/completions/sshmitm.exp b/test/lib/completions/sshmitm.exp
index b8f8a2c..13b5067 100644
--- a/test/lib/completions/sshmitm.exp
+++ b/test/lib/completions/sshmitm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sshow.exp b/test/lib/completions/sshow.exp
index 36a6cc2..074d7b1 100644
--- a/test/lib/completions/sshow.exp
+++ b/test/lib/completions/sshow.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/strace.exp b/test/lib/completions/strace.exp
index 55004d2..933d1b4 100644
--- a/test/lib/completions/strace.exp
+++ b/test/lib/completions/strace.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/strip.exp b/test/lib/completions/strip.exp
index 46d9f36..00f4ab9 100644
--- a/test/lib/completions/strip.exp
+++ b/test/lib/completions/strip.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sudo.exp b/test/lib/completions/sudo.exp
index 1299a6d..e7a3916 100644
--- a/test/lib/completions/sudo.exp
+++ b/test/lib/completions/sudo.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/svk.exp b/test/lib/completions/svk.exp
index a08674d..a794a00 100644
--- a/test/lib/completions/svk.exp
+++ b/test/lib/completions/svk.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/svn.exp b/test/lib/completions/svn.exp
index fe40d6f..d1a08ae 100644
--- a/test/lib/completions/svn.exp
+++ b/test/lib/completions/svn.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/svnadmin.exp b/test/lib/completions/svnadmin.exp
index 35e0702..f20d52c 100644
--- a/test/lib/completions/svnadmin.exp
+++ b/test/lib/completions/svnadmin.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/svnlook.exp b/test/lib/completions/svnlook.exp
index 33b6705..114435e 100644
--- a/test/lib/completions/svnlook.exp
+++ b/test/lib/completions/svnlook.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sync_members.exp b/test/lib/completions/sync_members.exp
index 4cb84ad..817432b 100644
--- a/test/lib/completions/sync_members.exp
+++ b/test/lib/completions/sync_members.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/sysctl.exp b/test/lib/completions/sysctl.exp
index e1866f5..d163ea5 100644
--- a/test/lib/completions/sysctl.exp
+++ b/test/lib/completions/sysctl.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {sysctl -N -a 2>/dev/null | grep ^kern | sort -u} values]} {
assert_complete $values "sysctl kern"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/tac.exp b/test/lib/completions/tac.exp
index 2123005..d4fe793 100644
--- a/test/lib/completions/tac.exp
+++ b/test/lib/completions/tac.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/tail.exp b/test/lib/completions/tail.exp
index c8a82d9..fd685b1 100644
--- a/test/lib/completions/tail.exp
+++ b/test/lib/completions/tail.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {tail --help} "" "" "unsupported"]} {
assert_complete_any "tail --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/tar.exp b/test/lib/completions/tar.exp
index 43c60ff..37f1ae4 100644
--- a/test/lib/completions/tar.exp
+++ b/test/lib/completions/tar.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/tcpkill.exp b/test/lib/completions/tcpkill.exp
index e8cc9c1..d3a45e4 100644
--- a/test/lib/completions/tcpkill.exp
+++ b/test/lib/completions/tcpkill.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/tcpnice.exp b/test/lib/completions/tcpnice.exp
index 44bb59c..b4b9309 100644
--- a/test/lib/completions/tcpnice.exp
+++ b/test/lib/completions/tcpnice.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/tee.exp b/test/lib/completions/tee.exp
index c25057b..1058bb8 100644
--- a/test/lib/completions/tee.exp
+++ b/test/lib/completions/tee.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/texindex.exp b/test/lib/completions/texindex.exp
index d5b8cd7..43b4c09 100644
--- a/test/lib/completions/texindex.exp
+++ b/test/lib/completions/texindex.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/tightvncviewer.exp b/test/lib/completions/tightvncviewer.exp
index 6eba24c..ee987f6 100644
--- a/test/lib/completions/tightvncviewer.exp
+++ b/test/lib/completions/tightvncviewer.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/time.exp b/test/lib/completions/time.exp
index b114318..3bed4fd 100644
--- a/test/lib/completions/time.exp
+++ b/test/lib/completions/time.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/touch.exp b/test/lib/completions/touch.exp
index f0960ef..61d22b3 100644
--- a/test/lib/completions/touch.exp
+++ b/test/lib/completions/touch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {touch --help} "" "" "unsupported"]} {
assert_complete_any "touch --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/tr.exp b/test/lib/completions/tr.exp
index 68b11a3..c10c8ba 100644
--- a/test/lib/completions/tr.exp
+++ b/test/lib/completions/tr.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {tr --help} "" "" "unsupported"]} {
assert_complete_any "tr --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/unace.exp b/test/lib/completions/unace.exp
index 0afbaaf..c9d7606 100644
--- a/test/lib/completions/unace.exp
+++ b/test/lib/completions/unace.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/uname.exp b/test/lib/completions/uname.exp
index 2179daf..0c363ab 100644
--- a/test/lib/completions/uname.exp
+++ b/test/lib/completions/uname.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {uname --help} "" "" "unsupported"]} {
assert_complete_any "uname --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/unexpand.exp b/test/lib/completions/unexpand.exp
index 3182256..c9aecc2 100644
--- a/test/lib/completions/unexpand.exp
+++ b/test/lib/completions/unexpand.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {unexpand --help} "" "" "unsupported"]} {
assert_complete_any "unexpand --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/uniq.exp b/test/lib/completions/uniq.exp
index 20dbcfa..d516106 100644
--- a/test/lib/completions/uniq.exp
+++ b/test/lib/completions/uniq.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {uniq --help} "" "" "unsupported"]} {
assert_complete_any "uniq --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/units.exp b/test/lib/completions/units.exp
index a40b5f3..96ec91d 100644
--- a/test/lib/completions/units.exp
+++ b/test/lib/completions/units.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {units --help} "" "" "unsupported"]} {
assert_complete_any "units --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/unpack200.exp b/test/lib/completions/unpack200.exp
index 845701d..b436049 100644
--- a/test/lib/completions/unpack200.exp
+++ b/test/lib/completions/unpack200.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/unrar.exp b/test/lib/completions/unrar.exp
index e66e3c8..b5e27b2 100644
--- a/test/lib/completions/unrar.exp
+++ b/test/lib/completions/unrar.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/unset.exp b/test/lib/completions/unset.exp
index a5e7fc9..42e753c 100644
--- a/test/lib/completions/unset.exp
+++ b/test/lib/completions/unset.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/unshunt.exp b/test/lib/completions/unshunt.exp
index 964cac6..96cd586 100644
--- a/test/lib/completions/unshunt.exp
+++ b/test/lib/completions/unshunt.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/update-alternatives.exp b/test/lib/completions/update-alternatives.exp
index 10ff4e6..b94d88c 100644
--- a/test/lib/completions/update-alternatives.exp
+++ b/test/lib/completions/update-alternatives.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/update-rc.d.exp b/test/lib/completions/update-rc.d.exp
index 9c2c246..f2eafea 100644
--- a/test/lib/completions/update-rc.d.exp
+++ b/test/lib/completions/update-rc.d.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/urlsnarf.exp b/test/lib/completions/urlsnarf.exp
index c5b2692..ed54362 100644
--- a/test/lib/completions/urlsnarf.exp
+++ b/test/lib/completions/urlsnarf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vdir.exp b/test/lib/completions/vdir.exp
index b525c38..c0e5ee4 100644
--- a/test/lib/completions/vdir.exp
+++ b/test/lib/completions/vdir.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgcfgbackup.exp b/test/lib/completions/vgcfgbackup.exp
index 19ceeec..b7e509a 100644
--- a/test/lib/completions/vgcfgbackup.exp
+++ b/test/lib/completions/vgcfgbackup.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgcfgrestore.exp b/test/lib/completions/vgcfgrestore.exp
index e1c3c3b..e40cd21 100644
--- a/test/lib/completions/vgcfgrestore.exp
+++ b/test/lib/completions/vgcfgrestore.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgchange.exp b/test/lib/completions/vgchange.exp
index 645eedb..b6c0e1d 100644
--- a/test/lib/completions/vgchange.exp
+++ b/test/lib/completions/vgchange.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgck.exp b/test/lib/completions/vgck.exp
index 67209b1..b4d58ae 100644
--- a/test/lib/completions/vgck.exp
+++ b/test/lib/completions/vgck.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgconvert.exp b/test/lib/completions/vgconvert.exp
index 065c482..362c44b 100644
--- a/test/lib/completions/vgconvert.exp
+++ b/test/lib/completions/vgconvert.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgcreate.exp b/test/lib/completions/vgcreate.exp
index 7c324e6..4cb7dd4 100644
--- a/test/lib/completions/vgcreate.exp
+++ b/test/lib/completions/vgcreate.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgdisplay.exp b/test/lib/completions/vgdisplay.exp
index b6bc912..6a8ed84 100644
--- a/test/lib/completions/vgdisplay.exp
+++ b/test/lib/completions/vgdisplay.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgexport.exp b/test/lib/completions/vgexport.exp
index 2ad4230..2900960 100644
--- a/test/lib/completions/vgexport.exp
+++ b/test/lib/completions/vgexport.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgextend.exp b/test/lib/completions/vgextend.exp
index 18a491d..3c46a8f 100644
--- a/test/lib/completions/vgextend.exp
+++ b/test/lib/completions/vgextend.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgimport.exp b/test/lib/completions/vgimport.exp
index e4568f3..ed04e28 100644
--- a/test/lib/completions/vgimport.exp
+++ b/test/lib/completions/vgimport.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgmerge.exp b/test/lib/completions/vgmerge.exp
index 8ba5e89..a4f8833 100644
--- a/test/lib/completions/vgmerge.exp
+++ b/test/lib/completions/vgmerge.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgmknodes.exp b/test/lib/completions/vgmknodes.exp
index d24552f..5c9feeb 100644
--- a/test/lib/completions/vgmknodes.exp
+++ b/test/lib/completions/vgmknodes.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgreduce.exp b/test/lib/completions/vgreduce.exp
index 887ba8d..f6af315 100644
--- a/test/lib/completions/vgreduce.exp
+++ b/test/lib/completions/vgreduce.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgremove.exp b/test/lib/completions/vgremove.exp
index 26dadf9..0dc5eda 100644
--- a/test/lib/completions/vgremove.exp
+++ b/test/lib/completions/vgremove.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgrename.exp b/test/lib/completions/vgrename.exp
index 8ddaa75..8143863 100644
--- a/test/lib/completions/vgrename.exp
+++ b/test/lib/completions/vgrename.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgs.exp b/test/lib/completions/vgs.exp
index a27e365..22ab176 100644
--- a/test/lib/completions/vgs.exp
+++ b/test/lib/completions/vgs.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgscan.exp b/test/lib/completions/vgscan.exp
index 4bb8c35..ae8168c 100644
--- a/test/lib/completions/vgscan.exp
+++ b/test/lib/completions/vgscan.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vgsplit.exp b/test/lib/completions/vgsplit.exp
index 54e7034..b183cfd 100644
--- a/test/lib/completions/vgsplit.exp
+++ b/test/lib/completions/vgsplit.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/vncviewer.exp b/test/lib/completions/vncviewer.exp
index 3d47f49..8c51e0b 100644
--- a/test/lib/completions/vncviewer.exp
+++ b/test/lib/completions/vncviewer.exp
@@ -1,13 +1,13 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {
/declare -f _vncviewer_bootstrap/d
}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/wc.exp b/test/lib/completions/wc.exp
index 8ad2bf8..b261b6a 100644
--- a/test/lib/completions/wc.exp
+++ b/test/lib/completions/wc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {wc --help} "" "" "unsupported"]} {
assert_complete_any "wc --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/webmitm.exp b/test/lib/completions/webmitm.exp
index 1d48a3a..adb97cc 100644
--- a/test/lib/completions/webmitm.exp
+++ b/test/lib/completions/webmitm.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/wget.exp b/test/lib/completions/wget.exp
index 245b27b..8e830a1 100644
--- a/test/lib/completions/wget.exp
+++ b/test/lib/completions/wget.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/who.exp b/test/lib/completions/who.exp
index 73928ef..6cca679 100644
--- a/test/lib/completions/who.exp
+++ b/test/lib/completions/who.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -13,7 +13,7 @@ setup
if {[assert_exec {who --help} "" "" "unsupported"]} {
assert_complete_any "who --"
-}; # if
+}
sync_after_int
diff --git a/test/lib/completions/withlist.exp b/test/lib/completions/withlist.exp
index 6310466..e1f91f6 100644
--- a/test/lib/completions/withlist.exp
+++ b/test/lib/completions/withlist.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/wol.exp b/test/lib/completions/wol.exp
index 84a2d88..a06a2ae 100644
--- a/test/lib/completions/wol.exp
+++ b/test/lib/completions/wol.exp
@@ -2,13 +2,13 @@ proc setup {} {
# See fixtures/shared/bin/{arp,ifconfig}
assert_bash_exec {OLDPATH="$PATH"; PATH="$TESTDIR/fixtures/shared/bin:$PATH";}
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
assert_bash_exec {PATH="$OLDPATH"; unset -v OLDPATH}
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/wtf.exp b/test/lib/completions/wtf.exp
index 8250bec..b1693c8 100644
--- a/test/lib/completions/wtf.exp
+++ b/test/lib/completions/wtf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/wvdial.exp b/test/lib/completions/wvdial.exp
index 8d4669d..5b52daa 100644
--- a/test/lib/completions/wvdial.exp
+++ b/test/lib/completions/wvdial.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xhost.exp b/test/lib/completions/xhost.exp
index aeceadb..d4098ad 100644
--- a/test/lib/completions/xhost.exp
+++ b/test/lib/completions/xhost.exp
@@ -1,12 +1,12 @@
proc setup {} {
assert_bash_exec {HOME=$TESTDIR}
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
@@ -17,7 +17,7 @@ set test "Tab should complete hostnames"
set hosts {}
foreach h [exec bash -c "compgen -A hostname"] {
lappend hosts $h
-}; # foreach
+}
assert_complete $hosts "xhost " $test
@@ -33,8 +33,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
# Only append hostname if starting with $char
if {[string range $h 0 0] == "$char"} {
lappend hosts $h
- }; # if
-}; # foreach
+ }
+}
assert_complete $hosts "xhost $char" $test
@@ -46,7 +46,7 @@ set test "Tab should complete hostnames prefixed with +"
set hosts {}
foreach h [exec bash -c "compgen -A hostname"] {
lappend hosts "+$h"
-}; # foreach
+}
assert_complete $hosts "xhost \+" $test
@@ -61,8 +61,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
# Only append hostname if starting with $char
if {[string range $h 0 0] == "$char"} {
lappend hosts "+$h"
- }; # if
-}; # foreach
+ }
+}
assert_complete $hosts "xhost +$char"
@@ -74,7 +74,7 @@ set test "Tab should complete hostnames prefixed with -"
set hosts {}
foreach h [exec bash -c "compgen -A hostname"] {
lappend hosts "-$h"
-}; # foreach
+}
assert_complete $hosts "xhost -" $test
@@ -89,8 +89,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
# Only append hostname if starting with $char
if {[string range $h 0 0] == "$char"} {
lappend hosts "-$h"
- }; # if
-}; # foreach
+ }
+}
assert_complete $hosts "xhost -$char" $test
diff --git a/test/lib/completions/xmllint.exp b/test/lib/completions/xmllint.exp
index 1545147..20daab6 100644
--- a/test/lib/completions/xmllint.exp
+++ b/test/lib/completions/xmllint.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xmlwf.exp b/test/lib/completions/xmlwf.exp
index a996d45..6c306f3 100644
--- a/test/lib/completions/xmlwf.exp
+++ b/test/lib/completions/xmlwf.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xmms.exp b/test/lib/completions/xmms.exp
index c4ad64e..1f1f6d5 100644
--- a/test/lib/completions/xmms.exp
+++ b/test/lib/completions/xmms.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xpovray.exp b/test/lib/completions/xpovray.exp
index 92cc903..53a5fcd 100644
--- a/test/lib/completions/xpovray.exp
+++ b/test/lib/completions/xpovray.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xrandr.exp b/test/lib/completions/xrandr.exp
index 649ed43..14beb76 100644
--- a/test/lib/completions/xrandr.exp
+++ b/test/lib/completions/xrandr.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xsltproc.exp b/test/lib/completions/xsltproc.exp
index 2470c22..2c558ff 100644
--- a/test/lib/completions/xsltproc.exp
+++ b/test/lib/completions/xsltproc.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xvnc4viewer.exp b/test/lib/completions/xvnc4viewer.exp
index 3456c3e..b10e272 100644
--- a/test/lib/completions/xvnc4viewer.exp
+++ b/test/lib/completions/xvnc4viewer.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/xz.exp b/test/lib/completions/xz.exp
index 820b068..83b1f35 100644
--- a/test/lib/completions/xz.exp
+++ b/test/lib/completions/xz.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ypcat.exp b/test/lib/completions/ypcat.exp
index f1bd0c0..a8249dc 100644
--- a/test/lib/completions/ypcat.exp
+++ b/test/lib/completions/ypcat.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/ypmatch.exp b/test/lib/completions/ypmatch.exp
index f1695f6..ac264c1 100644
--- a/test/lib/completions/ypmatch.exp
+++ b/test/lib/completions/ypmatch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/yum-arch.exp b/test/lib/completions/yum-arch.exp
index defb7bf..85c47c2 100644
--- a/test/lib/completions/yum-arch.exp
+++ b/test/lib/completions/yum-arch.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/completions/yum.exp b/test/lib/completions/yum.exp
index 09d7282..899ecdd 100644
--- a/test/lib/completions/yum.exp
+++ b/test/lib/completions/yum.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified
-}; # teardown()
+}
setup
diff --git a/test/lib/library.exp b/test/lib/library.exp
index c76d985..a79ec52 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -22,7 +22,7 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
if {[string length $aCmd] != 0} {
send "$aCmd\r"
expect -ex "$aCmd\r\n"
- }; # if
+ }
if {[string length $title] == 0} {set title $aCmd}
expect -ex $prompt
set results $expect_out(buffer); # Catch output
@@ -35,9 +35,9 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
if {$out == -1 && [string length $results] > 0} {
if {[info exists multipass_name]} {
fail "ERROR Unexpected output from bash command \"$title\""
- }; # if
+ }
send_user "ERROR Unexpected output from bash command \"$title\":\n$results"
- }; # if
+ }
set cmd "echo $?"
send "$cmd\r"
@@ -46,11 +46,11 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
$prompt {
if {[info exists multipass_name]} {
fail "ERROR executing bash command \"$title\""
- }; # if
+ }
send_user "ERROR executing bash command \"$title\""
}
- }; # expect
-}; # assert_bash_exec()
+ }
+}
# Test `type ...' in bash
@@ -64,10 +64,10 @@ proc assert_bash_type {command} {
expect {
-ex 0 { set result true }
-ex 1 { set result false; unsupported "$test" }
- }; # expect
+ }
expect "/@"
return $result
-}; # assert_bash_type()
+}
# Make sure the expected list is returned by executing the specified command.
@@ -103,7 +103,7 @@ proc assert_bash_list_dir {expected cmd dir {test ""} {prompt /@} {size 20}} {
assert_bash_list $expected $cmd $test $prompt $size
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
-}; # assert_bash_list_dir()
+}
# Make sure the expected items are returned by TAB-completing the specified
@@ -140,23 +140,23 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
# Assume last word of `$cmd' is word to complete on.
set index [expr [llength $words] - 1]
set cur [lindex $words $index]
- }; # if
+ }
# Remove second word from beginning of single item $expected
if {[string first $cur $expected] == 0} {
set expected [list [string range $expected [string length $cur] end]]
- }; # if
- }; # if
+ }
+ }
} else {
expect -ex "$cmd\r\n"
# Make sure expected items are unique
set expected [lsort -unique $expected]
- }; # if
+ }
if {[lsearch -exact $filters "ltrim_colon_completions"] != -1} {
# If partial contains colon (:), remove partial from begin of items
# See also: bash_completion.__ltrim_colon_completions()
_ltrim_colon_completions cword expected
- }; # if
+ }
if {[match_items $expected $test $prompt $size]} {
if {[llength $expected] == 1} {
@@ -169,7 +169,7 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
set cmd2 $cmd
} else {
set cmd2 [_remove_cword_from_cmd $cmd $cword]
- }; # if
+ }
# Determine common prefix of completions
set common [::textutil::string::longestCommonPrefixList $expected]
@@ -178,13 +178,13 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
-ex "$prompt$cmd2$common" { pass "$test" }
-re $prompt { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
- }; # expect
- }; # if
+ }
+ }
} else {
fail "$test"
- }; # if
- }; # if
-}; # assert_complete()
+ }
+ }
+}
# @param string $cmd Command to remove cword from
@@ -203,7 +203,7 @@ proc _remove_cword_from_cmd {cmd {cword ""}} {
# Remove $cword from end of $cmd
if {[string last $cword $cmd] == [string length $cmd] - [string length $cword]} {
set cmd2 [string range $cmd 0 [expr [string last $cword $cmd] - 1]]
- }; # if
+ }
} else {
# No, $cword not specified;
# Check if last argument is really an-argument-to-complete, i.e.
@@ -217,10 +217,10 @@ proc _remove_cword_from_cmd {cmd {cword ""}} {
# Remove argument-to-complete from end of $cmd
set cmd2 [lrange [split $cmd] 0 end-1]
append cmd2 " "
- }; # if
- }; # if
+ }
+ }
return $cmd2
-}; # _remove_cword_from_cmd()
+}
# Escape regexp special characters
@@ -253,8 +253,8 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
}
-re $prompt { unresolved "$test at prompt" }
eof { unresolved "eof" }
- }; # expect
-}; # assert_complete_any()
+ }
+}
# Make sure the expected files are returned by TAB-completing the
@@ -273,7 +273,7 @@ proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
assert_complete $expected $cmd $test $prompt $size $cword
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
-}; # assert_complete_dir
+}
@@ -304,11 +304,11 @@ proc assert_complete_partial {expected cmd {partial ""} {test ""} {prompt /@} {s
# Only append item if starting with $partial
if {[string range $item 0 [expr [string length $partial] - 1]] == "$partial"} {
lappend pick $item
- }; # if
- }; # foreach
+ }
+ }
assert_complete $pick "$cmd $partial" $test $prompt $size $partial $filters
- }; # if
-}; # assert_complete_partial()
+ }
+}
# See also: bash_completion._ltrim_colon_completions
@@ -329,11 +329,11 @@ proc _ltrim_colon_completions {cword items} {
if {[string first $cword_out $item] == 0} {
# Strip colon-prefix
lset items_out $i [string range $item [string length $cword_out] end]
- }; # if
- }; # for
+ }
+ }
#set cword_out ""
- }; # if
-}; # _ltrim_colon_completions()
+ }
+}
# Make sure the bash environment hasn't changed between now and the last call
@@ -370,7 +370,7 @@ proc assert_env_unmodified {{sed ""} {file ""} {diff ""}} {
append diff "\r\n"
} else {
set diff ""
- }; # if
+ }
# Execute diff
@@ -392,11 +392,11 @@ proc assert_env_unmodified {{sed ""} {file ""} {diff ""}} {
# Remove possible `\r\n[wd]@' from end of diff
if {[string last "\r\n[wd]@" $diff] == [string length $diff] - [string length "\r\n[wd]@"]} {
set diff [string range $diff 0 [expr [string last "\r\n[wd]@" $diff] - 1]]
- }; # if
+ }
send_user $diff;
}
- }; # expect
-}; # assert_env_unmodified()
+ }
+}
# Make sure the specified command executed from within Tcl/Expect.
@@ -426,10 +426,10 @@ proc assert_exec {cmd {stdout ''} {test ''} {failcmd "unresolved"}} {
unsupported "$test"
} else {
$failcmd "$test"
- }; # if
- }; # if
+ }
+ }
return $result
-}; # assert_exec()
+}
# Check that no completion is attempted on a certain command.
@@ -439,7 +439,7 @@ proc assert_exec {cmd {stdout ''} {test ''} {failcmd "unresolved"}} {
proc assert_no_complete {{cmd} {test ""}} {
if {[string length $test] == 0} {
set test "$cmd shouldn't complete"
- }; # if
+ }
send "$cmd\t"
expect -ex "$cmd"
@@ -451,8 +451,8 @@ proc assert_no_complete {{cmd} {test ""}} {
-re "^$endguard$" { pass "$test" }
default { fail "$test" }
timeout { fail "$test" }
- }; # expect
-}; # assert_no_complete()
+ }
+}
# Check that no output is generated on a certain command.
@@ -510,7 +510,7 @@ proc get_known_hosts {{cword ''}} {
assert_bash_exec "_known_hosts_real '$cword'; echo_array COMPREPLY" \
{} /@ result
return $result
-}; # get_known_hosts()
+}
# Get hostnames
@@ -524,9 +524,9 @@ proc get_hosts {} {
set avahi_hosts [get_hosts_avahi]
if {[llength $avahi_hosts] > 0} {
lappend hosts $avahi_hosts
- }; # if
+ }
return $hosts
-}; # get_hosts()
+}
# Get hostnames according to avahi
@@ -540,9 +540,9 @@ proc get_hosts_avahi {} {
# No, retrieving hosts yields error;
# Reset hosts
set hosts {}
- }; # if
+ }
return $hosts
-}; # get_hosts_avahi()
+}
# Get signals
@@ -558,10 +558,10 @@ proc get_signals {} {
set signal [string range $signal 3 end]
# Add signal (with dash (-) prefix) to list
lappend signals -$signal
- }; # if
- }; # foreach
+ }
+ }
return $signals
-}; # get_signals()
+}
# Initialize tcl globals with bash variables
@@ -572,7 +572,7 @@ proc init_tcl_bash_globals {} {
set BASH_VERSINFO [eval list $BASH_VERSINFO]
assert_bash_exec {printf "%s" "$BASH_VERSION"} "" /@ BASH_VERSION
assert_bash_exec {printf "%s" "$TESTDIR"} "" /@ TESTDIR
-}; # init_tcl_bash_globals()
+}
# Check whether completion is installed for the specified command by executing
@@ -590,13 +590,13 @@ proc is_bash_completion_installed_for {command} {
}
expect "/@"
return $result
-}; # is_bash_completion_installed_for()
+}
# Detect if test suite is running under Cygwin/Windows
proc is_cygwin {} {
expr {[string first [string tolower [exec uname -s]] cygwin] >= 0}
-}; # is_cygwin()
+}
# Expect items.
@@ -615,7 +615,7 @@ proc match_items {items test {prompt /@} {size 20}} {
_escape_regexp_chars item
append expected $item
if {[llength $items] > 1} {append expected {\s+}};
- }; # for
+ }
if {[llength $items] == 1} {
expect {
-re "^$expected\r\n$" { set result true }
@@ -625,17 +625,17 @@ proc match_items {items test {prompt /@} {size 20}} {
"\r\n" { set result false; break }
default { set result false; break }
timeout { set result false; break }
- }; # expect
+ }
} else {
expect {
-re "^$expected" { set result true }
default { set result false; break }
timeout { set result false; break }
- }; # expect
- }; # if
- }; # for
+ }
+ }
+ }
return $result
-}; # match_items()
+}
@@ -651,10 +651,10 @@ proc realcommand {cmd} {
set result [exec readlink -f $path]
} else {
set result $path
- }; # if
- }; # if
+ }
+ }
return $result
-}; # realcommand()
+}
# Generate filename to save environment to.
@@ -674,10 +674,10 @@ proc gen_env_filename {{file ""} {seq 1}} {
# Remove possible '.exp' suffix from filename
if {[string last ".exp" $file] == [string length $file] - [string length ".exp"]} {
set file [string range $file 0 [expr [string last ".exp" $file] - 1]]
- }; # if
- }; # if
+ }
+ }
return "\$TESTDIR/tmp/$file.env$seq~"
-}; # gen_env_filename()
+}
# Save the environment for later comparison
@@ -685,7 +685,7 @@ proc gen_env_filename {{file ""} {seq 1}} {
# `gen_env_filename()'.
proc save_env {{file ""}} {
_save_env [gen_env_filename $file 1]
-}; # save_env()
+}
# Save the environment for later comparison
@@ -693,7 +693,7 @@ proc save_env {{file ""}} {
# @see assert_env_unmodified()
proc _save_env {{file ""}} {
assert_bash_exec "{ set; declare -F; shopt -p; } > \"$file\""
-}; # _save_env()
+}
# Source bash_completion package
@@ -702,7 +702,7 @@ proc source_bash_completion {} {
assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
assert_bash_exec {BASH_COMPLETION=$(cd "$TESTDIR/.."; pwd)/bash_completion}
assert_bash_exec {source "$BASH_COMPLETION"}
-}; # source_bash_completion()
+}
# Split line into words, disregarding backslash escapes (e.g. \b (backspace),
@@ -727,7 +727,7 @@ proc split_words_bash {line} {
set part [string range $part 0 [expr [string length $part] - [string length "\\"] - 1]]
# Indicate glue on next run
set glue_next true
- }; # if
+ }
# Must `part' be appended to latest word (= glue)?
if {[llength $words] > 0 && [string is true $glue]} {
# Yes, join `part' to latest word;
@@ -738,11 +738,11 @@ proc split_words_bash {line} {
# No, don't append word to latest word;
# Append `part' as separate word
lappend words $part
- }; # if
+ }
set glue $glue_next
- }; # foreach
+ }
return $words
-}; # split_words_bash()
+}
# Given a list of items this proc finds a (part, full) pair so that when
@@ -826,7 +826,7 @@ proc start_bash {} {
# for bash < 3.2.41.
# -- FVu, Tue Sep 15 22:52:00 CEST 2009
assert_bash_exec {is_bash_version_minimal 3 2 41 || set +o history}
-}; # start_bash()
+}
# Redirect xtrace output to a file.
@@ -896,7 +896,7 @@ proc sync_after_tab {} {
# installed, so that "^$cdm.*$" doesn't match too early - before
# comp_install has finished
sleep .4
-}; # sync_after_tab()
+}
# Return current working directory with `TESTDIR' stripped
@@ -905,4 +905,4 @@ proc wd {} {
global TESTDIR
# Remove `$TESTDIR' prefix from current working directory
set wd [string replace [pwd] 0 [expr [string length $TESTDIR] - 1]]/
-}; # wd()
+}
diff --git a/test/unit/__expand_tilde_by_ref.exp b/test/unit/__expand_tilde_by_ref.exp
index d4a75d1..000d351 100644
--- a/test/unit/__expand_tilde_by_ref.exp
+++ b/test/unit/__expand_tilde_by_ref.exp
@@ -8,14 +8,14 @@ proc setup {home user} {
set _home [string trim $_home]
assert_bash_exec {echo "$USER"} {} /@ _user
set _user [string trim $_user]
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {
/var=/d
}
-}; # teardown()
+}
setup home user
diff --git a/test/unit/_count_args.exp b/test/unit/_count_args.exp
index da61bdb..a141948 100644
--- a/test/unit/_count_args.exp
+++ b/test/unit/_count_args.exp
@@ -1,7 +1,7 @@
proc setup {} {
assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
save_env
-}; # setup()
+}
proc teardown {} {
@@ -12,7 +12,7 @@ proc teardown {} {
d
}
}
-}; # teardown()
+}
setup
diff --git a/test/unit/_get_comp_words_by_ref.exp b/test/unit/_get_comp_words_by_ref.exp
index 22561e7..c88ad6f 100644
--- a/test/unit/_get_comp_words_by_ref.exp
+++ b/test/unit/_get_comp_words_by_ref.exp
@@ -1,7 +1,7 @@
proc setup {} {
assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
save_env
-}; # setup()
+}
proc teardown {} {
@@ -15,7 +15,7 @@ proc teardown {} {
d
}
}
-}; # teardown()
+}
setup
@@ -105,7 +105,7 @@ if {
set cmd {COMP_WORDS=(a "'" b c); COMP_CWORD=3}
} else {
set cmd {COMP_WORDS=(a "'b c"); COMP_CWORD=1}
-}; # if
+}
append cmd {; COMP_LINE="a 'b c"; COMP_POINT=6; _get_comp_words_by_ref cur prev; echo "$cur $prev"}
send "$cmd\r"
expect -ex "$cmd\r\n"
@@ -118,7 +118,7 @@ expect {
[lindex $::BASH_VERSINFO 2] < 35
} {xfail "$test"} {fail "$test"}
}
-}; # expect
+}
sync_after_int
@@ -133,7 +133,7 @@ if {
set cmd {COMP_WORDS=(a "\"" b c); COMP_CWORD=3}
} else {
set cmd {COMP_WORDS=(a "\"b c"); COMP_CWORD=1}
-}; # if
+}
append cmd {; COMP_LINE="a \"b c"; COMP_POINT=6}
assert_bash_exec $cmd
set cmd {_get_comp_words_by_ref cur prev; echo "$cur $prev"};
@@ -148,7 +148,7 @@ expect {
[lindex $::BASH_VERSINFO 2] < 35
} {xfail "$test"} {fail "$test"}
}
-}; # expect
+}
sync_after_int
@@ -161,7 +161,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
} else {
set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
set expected {"c :"}
-}; # if
+}
append cmd {; COMP_LINE='a b:c'; COMP_POINT=5}
# NOTE: Split-send cmd to prevent backspaces (\008) in output
assert_bash_exec $cmd $test
@@ -177,7 +177,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
set cmd {COMP_WORDS=(a "b:c"); COMP_CWORD=1}
} else {
set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
-}; # if
+}
append cmd {; COMP_LINE='a b:c'; COMP_POINT=5}
assert_bash_exec $cmd $test
set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -192,7 +192,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
set cmd {COMP_WORDS=(a b c:); COMP_CWORD=2}
} else {
set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
-}; # if
+}
append cmd {; COMP_LINE='a b c:'; COMP_POINT=6}
assert_bash_exec $cmd $test
set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -217,7 +217,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
set cmd {COMP_WORDS=(a "b::"); COMP_CWORD=1}
} else {
set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
-}; # if
+}
append cmd {; COMP_LINE='a b::'; COMP_POINT=5}
assert_bash_exec $cmd
set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -256,7 +256,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
} else {
set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
set expected c
-}; # if
+}
append cmd {; COMP_LINE='a b=c'; COMP_POINT=5}
assert_bash_exec $cmd
set cmd {_get_comp_words_by_ref cur prev; echo "$cur"}
@@ -286,7 +286,7 @@ expect {
-ex "\$(b c/@" { pass "$test" }
# Expected failure on bash-4
-ex "c/@" { xfail "$test" }
-}; # expect
+}
sync_after_int
@@ -303,7 +303,7 @@ expect {
-ex "\$(b c\\ d/@" { pass "$test" }
# Expected failure on bash-4
-ex "c\\ d/@" { xfail "$test" }
-}; # expect
+}
sync_after_int
@@ -318,7 +318,7 @@ if {
set cmd {COMP_WORDS=(a "'" b "&" c); COMP_CWORD=4}
} else {
set cmd {COMP_WORDS=(a "'b&c"); COMP_CWORD=1}
-}; # if
+}
append cmd {; COMP_LINE="a 'b&c"; COMP_POINT=6}
assert_bash_exec $cmd
set cmd {_get_comp_words_by_ref cur prev; printf %s "$cur"}
@@ -333,7 +333,7 @@ expect {
[lindex $::BASH_VERSINFO 2] < 35
} {xfail "$test"} {fail "$test"}
}
-}; # expect
+}
sync_after_int
diff --git a/test/unit/_get_cword.exp b/test/unit/_get_cword.exp
index 1e6e9bf..c3fbe2a 100644
--- a/test/unit/_get_cword.exp
+++ b/test/unit/_get_cword.exp
@@ -1,7 +1,7 @@
proc setup {} {
assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
save_env
-}; # setup()
+}
proc teardown {} {
@@ -12,7 +12,7 @@ proc teardown {} {
d
}
}
-}; # teardown()
+}
setup
@@ -105,7 +105,7 @@ if {
set cmd {COMP_WORDS=(a "'" b c); COMP_CWORD=3}
} else {
set cmd {COMP_WORDS=(a "'b c"); COMP_CWORD=1}
-}; # if
+}
append cmd {; COMP_LINE="a 'b c"; COMP_POINT=6; _get_cword}
send "$cmd\r"
expect -ex "$cmd\r\n"
@@ -118,7 +118,7 @@ expect {
[lindex $::BASH_VERSINFO 2] < 35
} {xfail "$test"} {fail "$test"}
}
-}; # expect
+}
sync_after_int
@@ -133,7 +133,7 @@ if {
set cmd {COMP_WORDS=(a "\"" b c); COMP_CWORD=3}
} else {
set cmd {COMP_WORDS=(a "\"b c"); COMP_CWORD=1}
-}; # if
+}
append cmd {; COMP_LINE="a \"b c"; COMP_POINT=6; _get_cword};
send "$cmd\r"
expect -ex "$cmd\r\n"
@@ -146,7 +146,7 @@ expect {
[lindex $::BASH_VERSINFO 2] < 35
} {xfail "$test"} {fail "$test"}
}
-}; # expect
+}
sync_after_int
@@ -159,7 +159,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
} else {
set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
set expected c
-}; # if
+}
append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword}
assert_bash_list $expected $cmd $test
@@ -172,7 +172,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
set cmd {COMP_WORDS=(a "b:c"); COMP_CWORD=1}
} else {
set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
-}; # if
+}
append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword :}
assert_bash_list b:c $cmd $test
@@ -185,7 +185,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
set cmd {COMP_WORDS=(a b c:); COMP_CWORD=2}
} else {
set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
-}; # if
+}
append cmd {; COMP_LINE='a b c:'; COMP_POINT=6; _get_cword :}
assert_bash_list c: $cmd $test
@@ -206,7 +206,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
set cmd {COMP_WORDS=(a "b::"); COMP_CWORD=1}
} else {
set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
-}; # if
+}
append cmd {; COMP_LINE='a b::'; COMP_POINT=5; _get_cword :}
assert_bash_list b:: $cmd $test
@@ -239,7 +239,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
} else {
set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
set expected c
-}; # if
+}
append cmd {; COMP_LINE='a b=c'; COMP_POINT=5; _get_cword}
assert_bash_list $expected $cmd $test
@@ -264,7 +264,7 @@ expect {
-ex "\$(b c/@" { pass "$test" }
# Expected failure on bash-4
-ex "c/@" { xfail "$test" }
-}; # expect
+}
sync_after_int
@@ -279,7 +279,7 @@ expect {
-ex "\$(b c\\ d/@" { pass "$test" }
# Expected failure on bash-4
-ex "c\\ d/@" { xfail "$test" }
-}; # expect
+}
sync_after_int
@@ -294,7 +294,7 @@ if {
set cmd {COMP_WORDS=(a "'" b "&" c); COMP_CWORD=4}
} else {
set cmd {COMP_WORDS=(a "'b&c"); COMP_CWORD=1}
-}; # if
+}
append cmd {; COMP_LINE="a 'b&c"; COMP_POINT=6; _get_cword}
send "$cmd\r"
expect -ex "$cmd\r\n"
@@ -307,7 +307,7 @@ expect {
[lindex $::BASH_VERSINFO 2] < 35
} {xfail "$test"} {fail "$test"}
}
-}; # expect
+}
sync_after_int
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 152cf88..3184279 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -1,6 +1,6 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
@@ -8,7 +8,7 @@ proc teardown {} {
/COMPREPLY=/d
/OLDHOME=/d
}
-}; # teardown()
+}
setup
@@ -35,7 +35,7 @@ set hosts [lsort -ascii $hosts]
set expected {}
foreach host $hosts {
lappend expected "user@$host:"
-}; # foreach
+}
# Call _known_hosts
set cmd {unset COMPREPLY; _known_hosts_real -acF fixtures/_known_hosts_real/config 'user@'; echo_array COMPREPLY}
assert_bash_list $expected $cmd $test
@@ -66,7 +66,7 @@ expect {
-re "^$hosts_config\r\n/@$" { fail "$test (known hosts file)" }
-re /@ { unresolved "$test at prompt" }
default { unresolved "$test" }
-}; # expect
+}
sync_after_int
@@ -89,7 +89,7 @@ expect -ex "$cmd\r\n"
expect {
-re "^$hosts\r\n/@$" { pass "$test" }
default { unresolved "$test" }
-}; # expect
+}
# Teardown environment
set cmd {HOME=$OLDHOME}
send "$cmd\r"
diff --git a/test/unit/compgen.exp b/test/unit/compgen.exp
index 6673bf0..8596cfa 100644
--- a/test/unit/compgen.exp
+++ b/test/unit/compgen.exp
@@ -1,11 +1,11 @@
proc setup {} {
save_env
-}; # setup()
+}
proc teardown {} {
assert_env_unmodified {/OLDPWD/d}
-}; # teardown()
+}
setup
@@ -17,7 +17,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
} else {
set test {compgen -f a\\\'b/ on bash-4 should return a\'b/c};
set cmd {compgen -f a\\\'b/}
-}; # if
+}
set dir fixtures/compgen
set prompt "/$dir/@"
assert_bash_exec "cd $dir" "" $prompt
@@ -39,7 +39,7 @@ expect {
}
-re $prompt { pass "$test" }
-re eof { unresolved "eof" }
-}; # expect
+}
sync_after_int $prompt
assert_bash_exec {cd "$TESTDIR"}
--
bash-completion
More information about the Bash-completion-commits
mailing list