Imported Upstream version 2.1upstream/2.1

71 files changed, 602 insertions, 10 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 337f7425..5cdd4f51 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/test/completion/chronyc.exp b/test/completion/chronyc.exp
new file mode 100644
index 00000000..9f7d8216
--- /dev/null
+++ b/test/completion/chronyc.exp
@@ -0,0 +1 @@
+assert_source_completions chronyc
diff --git a/test/completion/eject.exp b/test/completion/eject.exp
new file mode 100644
index 00000000..5f02e2ae
--- /dev/null
+++ b/test/completion/eject.exp
@@ -0,0 +1 @@
+assert_source_completions eject
diff --git a/test/completion/eog.exp b/test/completion/eog.exp
new file mode 100644
index 00000000..bba23491
--- /dev/null
+++ b/test/completion/eog.exp
@@ -0,0 +1 @@
+assert_source_completions eog
diff --git a/test/completion/file-roller.exp b/test/completion/file-roller.exp
new file mode 100644
index 00000000..2208ba14
--- /dev/null
+++ b/test/completion/file-roller.exp
@@ -0,0 +1 @@
+assert_source_completions file-roller
diff --git a/test/completion/genisoimage.exp b/test/completion/genisoimage.exp
new file mode 100644
index 00000000..de3be5ba
--- /dev/null
+++ b/test/completion/genisoimage.exp
@@ -0,0 +1 @@
+assert_source_completions genisoimage
diff --git a/test/completion/gphoto2.exp b/test/completion/gphoto2.exp
new file mode 100644
index 00000000..1eab94b0
--- /dev/null
+++ b/test/completion/gphoto2.exp
@@ -0,0 +1 @@
+assert_source_completions gphoto2
diff --git a/test/completion/hexdump.exp b/test/completion/hexdump.exp
new file mode 100644
index 00000000..7bdc0d36
--- /dev/null
+++ b/test/completion/hexdump.exp
@@ -0,0 +1 @@
+assert_source_completions hexdump
diff --git a/test/completion/interdiff.exp b/test/completion/interdiff.exp
new file mode 100644
index 00000000..97bbbdeb
--- /dev/null
+++ b/test/completion/interdiff.exp
@@ -0,0 +1 @@
+assert_source_completions interdiff
diff --git a/test/completion/lua.exp b/test/completion/lua.exp
new file mode 100644
index 00000000..a5774f4f
--- /dev/null
+++ b/test/completion/lua.exp
@@ -0,0 +1 @@
+assert_source_completions lua
diff --git a/test/completion/luac.exp b/test/completion/luac.exp
new file mode 100644
index 00000000..63f49ee7
--- /dev/null
+++ b/test/completion/luac.exp
@@ -0,0 +1 @@
+assert_source_completions luac
diff --git a/test/completion/luseradd.exp b/test/completion/luseradd.exp
new file mode 100644
index 00000000..69b10cfe
--- /dev/null
+++ b/test/completion/luseradd.exp
@@ -0,0 +1 @@
+assert_source_completions luseradd
diff --git a/test/completion/luserdel.exp b/test/completion/luserdel.exp
new file mode 100644
index 00000000..289a4c32
--- /dev/null
+++ b/test/completion/luserdel.exp
@@ -0,0 +1 @@
+assert_source_completions luserdel
diff --git a/test/completion/lusermod.exp b/test/completion/lusermod.exp
new file mode 100644
index 00000000..9ca4cecc
--- /dev/null
+++ b/test/completion/lusermod.exp
@@ -0,0 +1 @@
+assert_source_completions lusermod
diff --git a/test/completion/mussh.exp b/test/completion/mussh.exp
new file mode 100644
index 00000000..1232287c
--- /dev/null
+++ b/test/completion/mussh.exp
@@ -0,0 +1 @@
+assert_source_completions mussh
diff --git a/test/completion/nc.exp b/test/completion/nc.exp
new file mode 100644
index 00000000..a5c06b2d
--- /dev/null
+++ b/test/completion/nc.exp
@@ -0,0 +1 @@
+assert_source_completions nc
diff --git a/test/completion/ngrep.exp b/test/completion/ngrep.exp
new file mode 100644
index 00000000..3ad711b1
--- /dev/null
+++ b/test/completion/ngrep.exp
@@ -0,0 +1 @@
+assert_source_completions ngrep
diff --git a/test/completion/nmcli.exp b/test/completion/nmcli.exp
new file mode 100644
index 00000000..816468f7
--- /dev/null
+++ b/test/completion/nmcli.exp
@@ -0,0 +1 @@
+assert_source_completions nmcli
diff --git a/test/completion/opera.exp b/test/completion/opera.exp
new file mode 100644
index 00000000..9ab6a08f
--- /dev/null
+++ b/test/completion/opera.exp
@@ -0,0 +1 @@
+assert_source_completions opera
diff --git a/test/completion/pkg-get.exp b/test/completion/pkg-get.exp
new file mode 100644
index 00000000..4499142f
--- /dev/null
+++ b/test/completion/pkg-get.exp
@@ -0,0 +1 @@
+assert_source_completions pkg-get
diff --git a/test/completion/pkgadd.exp b/test/completion/pkgadd.exp
new file mode 100644
index 00000000..128c823e
--- /dev/null
+++ b/test/completion/pkgadd.exp
@@ -0,0 +1 @@
+assert_source_completions pkgadd
diff --git a/test/completion/pkgrm.exp b/test/completion/pkgrm.exp
new file mode 100644
index 00000000..e94337ae
--- /dev/null
+++ b/test/completion/pkgrm.exp
@@ -0,0 +1 @@
+assert_source_completions pkgrm
diff --git a/test/completion/pkgutil.exp b/test/completion/pkgutil.exp
new file mode 100644
index 00000000..b4d152ec
--- /dev/null
+++ b/test/completion/pkgutil.exp
@@ -0,0 +1 @@
+assert_source_completions pkgutil
diff --git a/test/completion/pydoc.exp b/test/completion/pydoc.exp
new file mode 100644
index 00000000..9555e850
--- /dev/null
+++ b/test/completion/pydoc.exp
@@ -0,0 +1 @@
+assert_source_completions pydoc
diff --git a/test/completion/pylint.exp b/test/completion/pylint.exp
new file mode 100644
index 00000000..d5a993de
--- /dev/null
+++ b/test/completion/pylint.exp
@@ -0,0 +1 @@
+assert_source_completions pylint
diff --git a/test/completion/ss.exp b/test/completion/ss.exp
new file mode 100644
index 00000000..f8703884
--- /dev/null
+++ b/test/completion/ss.exp
@@ -0,0 +1 @@
+assert_source_completions ss
diff --git a/test/completion/strings.exp b/test/completion/strings.exp
new file mode 100644
index 00000000..a5c544a2
--- /dev/null
+++ b/test/completion/strings.exp
@@ -0,0 +1 @@
+assert_source_completions strings
diff --git a/test/completion/svcadm.exp b/test/completion/svcadm.exp
new file mode 100644
index 00000000..f96d46dc
--- /dev/null
+++ b/test/completion/svcadm.exp
@@ -0,0 +1 @@
+assert_source_completions svcadm
diff --git a/test/completion/tshark.exp b/test/completion/tshark.exp
new file mode 100644
index 00000000..885fae32
--- /dev/null
+++ b/test/completion/tshark.exp
@@ -0,0 +1 @@
+assert_source_completions tshark
diff --git a/test/completion/udevadm.exp b/test/completion/udevadm.exp
deleted file mode 100644
index 69c980ff..00000000
--- a/test/completion/udevadm.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions udevadm
diff --git a/test/completion/vpnc.exp b/test/completion/vpnc.exp
new file mode 100644
index 00000000..29511b59
--- /dev/null
+++ b/test/completion/vpnc.exp
@@ -0,0 +1 @@
+assert_source_completions vpnc
diff --git a/test/completion/wsimport.exp b/test/completion/wsimport.exp
new file mode 100644
index 00000000..3f889e26
--- /dev/null
+++ b/test/completion/wsimport.exp
@@ -0,0 +1 @@
+assert_source_completions wsimport
diff --git a/test/completion/xxd.exp b/test/completion/xxd.exp
new file mode 100644
index 00000000..d9750e40
--- /dev/null
+++ b/test/completion/xxd.exp
@@ -0,0 +1 @@
+assert_source_completions xxd
diff --git a/test/fixtures/man/man/quux.8 b/test/fixtures/man/man/quux.8
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/fixtures/man/man/quux.8
diff --git a/test/lib/completions/chronyc.exp b/test/lib/completions/chronyc.exp
new file mode 100644
index 00000000..33458113
--- /dev/null
+++ b/test/lib/completions/chronyc.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "chronyc -"
+sync_after_int
+
+assert_complete_any "chronyc "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/udevadm.exp b/test/lib/completions/eject.exp
index bef16f0b..8de109d4 100644
--- a/test/lib/completions/udevadm.exp
+++ b/test/lib/completions/eject.exp
@@ -11,9 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "udevadm "
-
-
+assert_complete_any "eject -"
 sync_after_int
 
 
diff --git a/test/lib/completions/eog.exp b/test/lib/completions/eog.exp
new file mode 100644
index 00000000..b708c564
--- /dev/null
+++ b/test/lib/completions/eog.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "eog "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/file-roller.exp b/test/lib/completions/file-roller.exp
new file mode 100644
index 00000000..942941d0
--- /dev/null
+++ b/test/lib/completions/file-roller.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "file-roller "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/genisoimage.exp b/test/lib/completions/genisoimage.exp
new file mode 100644
index 00000000..5379f047
--- /dev/null
+++ b/test/lib/completions/genisoimage.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "genisoimage "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/gphoto2.exp b/test/lib/completions/gphoto2.exp
new file mode 100644
index 00000000..90dc1e5e
--- /dev/null
+++ b/test/lib/completions/gphoto2.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "gphoto2 --"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/hexdump.exp b/test/lib/completions/hexdump.exp
new file mode 100644
index 00000000..e3447482
--- /dev/null
+++ b/test/lib/completions/hexdump.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "hexdump -"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/interdiff.exp b/test/lib/completions/interdiff.exp
new file mode 100644
index 00000000..8880f461
--- /dev/null
+++ b/test/lib/completions/interdiff.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "interdiff "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/lua.exp b/test/lib/completions/lua.exp
new file mode 100644
index 00000000..864b1bfc
--- /dev/null
+++ b/test/lib/completions/lua.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "lua "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/luac.exp b/test/lib/completions/luac.exp
new file mode 100644
index 00000000..d7cfb23b
--- /dev/null
+++ b/test/lib/completions/luac.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "luac "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/luseradd.exp b/test/lib/completions/luseradd.exp
new file mode 100644
index 00000000..744314a7
--- /dev/null
+++ b/test/lib/completions/luseradd.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "luseradd -"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/luserdel.exp b/test/lib/completions/luserdel.exp
new file mode 100644
index 00000000..70d11661
--- /dev/null
+++ b/test/lib/completions/luserdel.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "luserdel "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/lusermod.exp b/test/lib/completions/lusermod.exp
new file mode 100644
index 00000000..f96293e6
--- /dev/null
+++ b/test/lib/completions/lusermod.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "lusermod "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/man.exp b/test/lib/completions/man.exp
index c7358c62..66b565a2 100644
--- a/test/lib/completions/man.exp
+++ b/test/lib/completions/man.exp
@@ -30,4 +30,8 @@ assert_complete "Bash::Completion" "man Bash::C"
 sync_after_int
 
 
+assert_complete_dir "man/quux.8" "man man/" $::srcdir/fixtures/man
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/mussh.exp b/test/lib/completions/mussh.exp
new file mode 100644
index 00000000..24c5c1f1
--- /dev/null
+++ b/test/lib/completions/mussh.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "mussh -"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/nc.exp b/test/lib/completions/nc.exp
new file mode 100644
index 00000000..84e61896
--- /dev/null
+++ b/test/lib/completions/nc.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "nc -"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ncftp.exp b/test/lib/completions/ncftp.exp
index 52d70756..d6683b86 100644
--- a/test/lib/completions/ncftp.exp
+++ b/test/lib/completions/ncftp.exp
@@ -12,8 +12,10 @@ setup
 
 
 assert_complete_any "ncftp "
+sync_after_int
 
 
+assert_complete_any "ncftp -"
 sync_after_int
 
 
diff --git a/test/lib/completions/ngrep.exp b/test/lib/completions/ngrep.exp
new file mode 100644
index 00000000..a49543bb
--- /dev/null
+++ b/test/lib/completions/ngrep.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ngrep -"
+sync_after_int
+
+assert_complete_any "ngrep -d "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/nmcli.exp b/test/lib/completions/nmcli.exp
new file mode 100644
index 00000000..b891f45e
--- /dev/null
+++ b/test/lib/completions/nmcli.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "nmcli "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/opera.exp b/test/lib/completions/opera.exp
new file mode 100644
index 00000000..9b666403
--- /dev/null
+++ b/test/lib/completions/opera.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "opera "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkg-get.exp b/test/lib/completions/pkg-get.exp
new file mode 100644
index 00000000..38b2b97f
--- /dev/null
+++ b/test/lib/completions/pkg-get.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pkg-get "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkgadd.exp b/test/lib/completions/pkgadd.exp
new file mode 100644
index 00000000..ba5eadf9
--- /dev/null
+++ b/test/lib/completions/pkgadd.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pkgadd "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkgrm.exp b/test/lib/completions/pkgrm.exp
new file mode 100644
index 00000000..08c685c4
--- /dev/null
+++ b/test/lib/completions/pkgrm.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pkgrm "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkgutil.exp b/test/lib/completions/pkgutil.exp
new file mode 100644
index 00000000..e79dea15
--- /dev/null
+++ b/test/lib/completions/pkgutil.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pkgutil "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pwd.exp b/test/lib/completions/pwd.exp
index f40fdb99..3690076a 100644
--- a/test/lib/completions/pwd.exp
+++ b/test/lib/completions/pwd.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_no_complete "pwd "
+assert_complete_any "pwd -"
 sync_after_int
 
 
diff --git a/test/lib/completions/pydoc.exp b/test/lib/completions/pydoc.exp
new file mode 100644
index 00000000..fe573693
--- /dev/null
+++ b/test/lib/completions/pydoc.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pydoc r"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pylint.exp b/test/lib/completions/pylint.exp
new file mode 100644
index 00000000..62774220
--- /dev/null
+++ b/test/lib/completions/pylint.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pylint -"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ss.exp b/test/lib/completions/ss.exp
new file mode 100644
index 00000000..f6e711c6
--- /dev/null
+++ b/test/lib/completions/ss.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ss -"
+sync_after_int
+
+assert_complete_any "ss -A "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/strings.exp b/test/lib/completions/strings.exp
new file mode 100644
index 00000000..103d5d3a
--- /dev/null
+++ b/test/lib/completions/strings.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "strings "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/svcadm.exp b/test/lib/completions/svcadm.exp
new file mode 100644
index 00000000..e7266146
--- /dev/null
+++ b/test/lib/completions/svcadm.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "svcadm "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tshark.exp b/test/lib/completions/tshark.exp
new file mode 100644
index 00000000..f2419119
--- /dev/null
+++ b/test/lib/completions/tshark.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "tshark -"
+sync_after_int
+
+assert_complete_any "tshark -G "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/vpnc.exp b/test/lib/completions/vpnc.exp
new file mode 100644
index 00000000..451d8093
--- /dev/null
+++ b/test/lib/completions/vpnc.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "vpnc -"
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/wget.exp b/test/lib/completions/wget.exp
index 8e830a12..457ae2ce 100644
--- a/test/lib/completions/wget.exp
+++ b/test/lib/completions/wget.exp
@@ -17,4 +17,10 @@ assert_complete_any "wget --"
 sync_after_int
 
 
+assert_no_complete "wget "
+
+
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/wsimport.exp b/test/lib/completions/wsimport.exp
new file mode 100644
index 00000000..36bf35c1
--- /dev/null
+++ b/test/lib/completions/wsimport.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "wsimport "
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/xrandr.exp b/test/lib/completions/xrandr.exp
index 14beb762..e76a5665 100644
--- a/test/lib/completions/xrandr.exp
+++ b/test/lib/completions/xrandr.exp
@@ -12,8 +12,9 @@ setup
 
 
 assert_complete_any "xrandr "
+sync_after_int
 
-
+assert_no_complete "xrandr --mode "
 sync_after_int
 
 
diff --git a/test/lib/completions/xxd.exp b/test/lib/completions/xxd.exp
new file mode 100644
index 00000000..6f12c0c0
--- /dev/null
+++ b/test/lib/completions/xxd.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "xxd "
+sync_after_int
+
+
+teardown
diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index b8cc2009..a736e6ed 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -88,8 +88,7 @@ foreach name {f f2} {
 
     set test "completing $name a\\\$b/ should return h"
     set cmd "$name a\\\$b/"
-    assert_complete_dir "\b\b\b\b\b$::srcdirabs/fixtures/_filedir/a\\\\\$b/h" \
-        $cmd "$::srcdir/fixtures/_filedir" $test
+    assert_complete_dir h $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -199,7 +198,7 @@ foreach name {f f2} {
 
 
     set cmd "$name \"a\\\$b/"; #"
-    assert_complete_dir "\b\b\b\b\b$::srcdirabs/fixtures/_filedir/a\\\\\$b/h\\\"" $cmd "$::srcdir/fixtures/_filedir"
+    assert_complete_dir {h"} $cmd "$::srcdir/fixtures/_filedir"; #"
 
 
     sync_after_int