diff options
Diffstat (limited to 'test')
52 files changed, 157 insertions, 63 deletions
diff --git a/test/completion/a2ps.exp b/test/completion/a2ps.exp index bc3b92bb..ce96ad1c 100644 --- a/test/completion/a2ps.exp +++ b/test/completion/a2ps.exp @@ -1 +1,3 @@ -source "lib/completions/a2ps.exp" +if {[assert_bash_type a2ps]} { + source "lib/completions/a2ps.exp" +}; # if diff --git a/test/completion/abook.exp b/test/completion/abook.exp index be738fa2..1ec636e2 100644 --- a/test/completion/abook.exp +++ b/test/completion/abook.exp @@ -1 +1,3 @@ -source "lib/completions/abook.exp" +if {[assert_bash_type abook]} { + source "lib/completions/abook.exp" +}; # if diff --git a/test/completion/alias.exp b/test/completion/alias.exp index 1f2a214f..9206d49a 100644 --- a/test/completion/alias.exp +++ b/test/completion/alias.exp @@ -1 +1,3 @@ -source "lib/completions/alias.exp" +if {[assert_bash_type alias]} { + source "lib/completions/alias.exp" +}; # if diff --git a/test/completion/animate.exp b/test/completion/animate.exp index 0eaf41cf..8db9d3e4 100644 --- a/test/completion/animate.exp +++ b/test/completion/animate.exp @@ -1 +1,3 @@ -source "lib/completions/animate.exp" +if {[assert_bash_type animate]} { + source "lib/completions/animate.exp" +}; # if diff --git a/test/completion/ant.exp b/test/completion/ant.exp index d725a80f..463ff7be 100644 --- a/test/completion/ant.exp +++ b/test/completion/ant.exp @@ -1 +1,3 @@ -source "lib/completions/ant.exp" +if {[assert_bash_type ant]} { + source "lib/completions/ant.exp" +}; # if diff --git a/test/completion/apt-build.exp b/test/completion/apt-build.exp index 5c474376..a1840996 100644 --- a/test/completion/apt-build.exp +++ b/test/completion/apt-build.exp @@ -1 +1,3 @@ -source "lib/completions/apt-build.exp" +if {[assert_bash_type apt-build]} { + source "lib/completions/apt-build.exp" +}; # if diff --git a/test/completion/apt-cache.exp b/test/completion/apt-cache.exp index 1c071a93..b6c9bf8f 100644 --- a/test/completion/apt-cache.exp +++ b/test/completion/apt-cache.exp @@ -1 +1,3 @@ -source "lib/completions/apt-cache.exp" +if {[assert_bash_type apt-cache]} { + source "lib/completions/apt-cache.exp" +}; # if diff --git a/test/completion/aptitude.exp b/test/completion/aptitude.exp index 3b8a5b23..68185a9d 100644 --- a/test/completion/aptitude.exp +++ b/test/completion/aptitude.exp @@ -1 +1,3 @@ -source "lib/completions/aptitude.exp" +if {[assert_bash_type aptitude]} { + source "lib/completions/aptitude.exp" +}; # if diff --git a/test/completion/aspell.exp b/test/completion/aspell.exp index 6937f591..ca7da262 100644 --- a/test/completion/aspell.exp +++ b/test/completion/aspell.exp @@ -1 +1,3 @@ -source "lib/completions/aspell.exp" +if {[assert_bash_type aspell]} { + source "lib/completions/aspell.exp" +}; # if diff --git a/test/completion/autoconf.exp b/test/completion/autoconf.exp index 006abf02..b5f2127c 100644 --- a/test/completion/autoconf.exp +++ b/test/completion/autoconf.exp @@ -1 +1,3 @@ -source "lib/completions/autoconf.exp" +if {[assert_bash_type autoconf]} { + source "lib/completions/autoconf.exp" +}; # if diff --git a/test/completion/automake.exp b/test/completion/automake.exp index fceb7a58..dd77e665 100644 --- a/test/completion/automake.exp +++ b/test/completion/automake.exp @@ -1 +1,3 @@ -source "lib/completions/automake.exp" +if {[assert_bash_type automake]} { + source "lib/completions/automake.exp" +}; # if diff --git a/test/completion/awk.exp b/test/completion/awk.exp index 851e038b..e87b1a21 100644 --- a/test/completion/awk.exp +++ b/test/completion/awk.exp @@ -1 +1,3 @@ -source "lib/completions/awk.exp" +if {[assert_bash_type awk]} { + source "lib/completions/awk.exp" +}; # if diff --git a/test/completion/bash.exp b/test/completion/bash.exp index ed373f84..b9fa8c8e 100644 --- a/test/completion/bash.exp +++ b/test/completion/bash.exp @@ -1 +1,3 @@ -source "lib/completions/bash.exp" +if {[assert_bash_type bash]} { + source "lib/completions/bash.exp" +}; # if diff --git a/test/completion/bk.exp b/test/completion/bk.exp index 2a0da514..740e3c27 100644 --- a/test/completion/bk.exp +++ b/test/completion/bk.exp @@ -1 +1,3 @@ -source "lib/completions/bk.exp" +if {[assert_bash_type bk]} { + source "lib/completions/bk.exp" +}; # if diff --git a/test/completion/btdownloadcurses.py.exp b/test/completion/btdownloadcurses.py.exp index 9e61174c..5b0db667 100644 --- a/test/completion/btdownloadcurses.py.exp +++ b/test/completion/btdownloadcurses.py.exp @@ -1 +1,3 @@ -source "lib/completions/btdownloadcurses.py.exp" +if {[assert_bash_type btdownloadcurses.py]} { + source "lib/completions/btdownloadcurses.py.exp" +}; # if diff --git a/test/completion/btdownloadgui.py.exp b/test/completion/btdownloadgui.py.exp index 9cbb959b..8ce38f89 100644 --- a/test/completion/btdownloadgui.py.exp +++ b/test/completion/btdownloadgui.py.exp @@ -1 +1,3 @@ -source "lib/completions/btdownloadgui.py.exp" +if {[assert_bash_type btdownloadgui.py]} { + source "lib/completions/btdownloadgui.py.exp" +}; # if diff --git a/test/completion/btdownloadheadless.py.exp b/test/completion/btdownloadheadless.py.exp index 14c568fb..67fff560 100644 --- a/test/completion/btdownloadheadless.py.exp +++ b/test/completion/btdownloadheadless.py.exp @@ -1 +1,3 @@ -source "lib/completions/btdownloadheadless.py.exp" +if {[assert_bash_type btdownloadheadless.py]} { + source "lib/completions/btdownloadheadless.py.exp" +}; # if diff --git a/test/completion/cardctl.exp b/test/completion/cardctl.exp index 9243c80d..4b4e9f99 100644 --- a/test/completion/cardctl.exp +++ b/test/completion/cardctl.exp @@ -1 +1,3 @@ -source "lib/completions/cardctl.exp" +if {[assert_bash_type cardctl]} { + source "lib/completions/cardctl.exp" +}; # if diff --git a/test/completion/cat.exp b/test/completion/cat.exp index b889d0ea..8bcc81b4 100644 --- a/test/completion/cat.exp +++ b/test/completion/cat.exp @@ -1 +1,3 @@ -source "lib/completions/cat.exp" +if {[assert_bash_type cat]} { + source "lib/completions/cat.exp" +}; # if diff --git a/test/completion/cc.exp b/test/completion/cc.exp index f206d99b..b3ba6d3c 100644 --- a/test/completion/cc.exp +++ b/test/completion/cc.exp @@ -1 +1,3 @@ -source "lib/completions/cc.exp" +if {[assert_bash_type cc]} { + source "lib/completions/cc.exp" +}; # if diff --git a/test/completion/cd.exp b/test/completion/cd.exp index bb395542..70eca117 100644 --- a/test/completion/cd.exp +++ b/test/completion/cd.exp @@ -1 +1,3 @@ -source "lib/completions/cd.exp" +if {[assert_bash_type cd]} { + source "lib/completions/cd.exp" +}; # if diff --git a/test/completion/cdrecord.exp b/test/completion/cdrecord.exp index 692305f4..29549518 100644 --- a/test/completion/cdrecord.exp +++ b/test/completion/cdrecord.exp @@ -1 +1,3 @@ -source "lib/completions/cdrecord.exp" +if {[assert_bash_type {cdrecord}]} { + source "lib/completions/cdrecord.exp" +}; # if diff --git a/test/completion/chkconfig.exp b/test/completion/chkconfig.exp index da12ed4d..22d559c0 100644 --- a/test/completion/chkconfig.exp +++ b/test/completion/chkconfig.exp @@ -1 +1,3 @@ -source "lib/completions/chkconfig.exp" +if {[assert_bash_type chkconfig]} { + source "lib/completions/chkconfig.exp" +}; # if diff --git a/test/completion/ci.exp b/test/completion/ci.exp index cec19b32..04b3fafa 100644 --- a/test/completion/ci.exp +++ b/test/completion/ci.exp @@ -1 +1,3 @@ -source "lib/completions/ci.exp" +if {[assert_bash_type ci]} { + source "lib/completions/ci.exp" +}; # if diff --git a/test/completion/clisp.exp b/test/completion/clisp.exp index d4a35254..7231834e 100644 --- a/test/completion/clisp.exp +++ b/test/completion/clisp.exp @@ -1 +1,3 @@ -source "lib/completions/clisp.exp" +if {[assert_bash_type clisp]} { + source "lib/completions/clisp.exp" +}; # if diff --git a/test/completion/co.exp b/test/completion/co.exp index 6603ca4e..d9a17e46 100644 --- a/test/completion/co.exp +++ b/test/completion/co.exp @@ -1 +1,3 @@ -source "lib/completions/co.exp" +if {[assert_bash_type co]} { + source "lib/completions/co.exp" +}; # if diff --git a/test/completion/composite.exp b/test/completion/composite.exp index e70c482b..fdb135ea 100644 --- a/test/completion/composite.exp +++ b/test/completion/composite.exp @@ -1 +1,3 @@ -source "lib/completions/composite.exp" +if {[assert_bash_type composite]} { + source "lib/completions/composite.exp" +}; # if diff --git a/test/completion/configure.exp b/test/completion/configure.exp index 4b0c4964..9041099f 100644 --- a/test/completion/configure.exp +++ b/test/completion/configure.exp @@ -1 +1,3 @@ -source "lib/completions/configure.exp" +if {[assert_bash_type configure]} { + source "lib/completions/configure.exp" +}; # if diff --git a/test/completion/convert.exp b/test/completion/convert.exp index 90c2cbfd..e4f8365d 100644 --- a/test/completion/convert.exp +++ b/test/completion/convert.exp @@ -1 +1,3 @@ -source "lib/completions/convert.exp" +if {[assert_bash_type convert]} { + source "lib/completions/convert.exp" +}; # if diff --git a/test/completion/cp.exp b/test/completion/cp.exp index 7f532c13..d75048f1 100644 --- a/test/completion/cp.exp +++ b/test/completion/cp.exp @@ -1 +1,3 @@ -source "lib/completions/cp.exp" +if {[assert_bash_type cp]} { + source "lib/completions/cp.exp" +}; # if diff --git a/test/completion/cpio.exp b/test/completion/cpio.exp index 544fe0bb..164ad660 100644 --- a/test/completion/cpio.exp +++ b/test/completion/cpio.exp @@ -1 +1,3 @@ -source "lib/completions/cpio.exp" +if {[assert_bash_type cpio]} { + source "lib/completions/cpio.exp" +}; # if diff --git a/test/completion/createdb.exp b/test/completion/createdb.exp index 90ebe305..c7d70ec3 100644 --- a/test/completion/createdb.exp +++ b/test/completion/createdb.exp @@ -1 +1,3 @@ -source "lib/completions/createdb.exp" +if {[assert_bash_type createdb]} { + source "lib/completions/createdb.exp" +}; # if diff --git a/test/completion/csplit.exp b/test/completion/csplit.exp index f4c0bd78..8c82798d 100644 --- a/test/completion/csplit.exp +++ b/test/completion/csplit.exp @@ -1 +1,3 @@ -source "lib/completions/csplit.exp" +if {[assert_bash_type csplit]} { + source "lib/completions/csplit.exp" +}; # if diff --git a/test/completion/cut.exp b/test/completion/cut.exp index 3458062c..523a3b45 100644 --- a/test/completion/cut.exp +++ b/test/completion/cut.exp @@ -1 +1,3 @@ -source "lib/completions/cut.exp" +if {[assert_bash_type cut]} { + source "lib/completions/cut.exp" +}; # if diff --git a/test/completion/date.exp b/test/completion/date.exp index cab1d1c0..ce6fce1e 100644 --- a/test/completion/date.exp +++ b/test/completion/date.exp @@ -1 +1,3 @@ -source "lib/completions/date.exp" +if {[assert_bash_type date]} { + source "lib/completions/date.exp" +}; # if diff --git a/test/completion/dcop.exp b/test/completion/dcop.exp index 8b4d7b41..62942c12 100644 --- a/test/completion/dcop.exp +++ b/test/completion/dcop.exp @@ -1 +1,3 @@ -source "lib/completions/dcop.exp" +if {[assert_bash_type dcop]} { + source "lib/completions/dcop.exp" +}; # if diff --git a/test/completion/dd.exp b/test/completion/dd.exp index 1d322f3f..bda4a1d4 100644 --- a/test/completion/dd.exp +++ b/test/completion/dd.exp @@ -1 +1,3 @@ -source "lib/completions/dd.exp" +if {[assert_bash_type dd]} { + source "lib/completions/dd.exp" +}; # if diff --git a/test/completion/df.exp b/test/completion/df.exp index 1e1241e3..771648ba 100644 --- a/test/completion/df.exp +++ b/test/completion/df.exp @@ -1 +1,3 @@ -source "lib/completions/df.exp" +if {[assert_bash_type df]} { + source "lib/completions/df.exp" +}; # if diff --git a/test/completion/dhclient.exp b/test/completion/dhclient.exp index d4a424c8..77dd76c8 100644 --- a/test/completion/dhclient.exp +++ b/test/completion/dhclient.exp @@ -1 +1,3 @@ -source "lib/completions/dhclient.exp" +if {[assert_bash_type dhclient]} { + source "lib/completions/dhclient.exp" +}; # if diff --git a/test/completion/diff.exp b/test/completion/diff.exp index 31b3ee46..ffc3a9d0 100644 --- a/test/completion/diff.exp +++ b/test/completion/diff.exp @@ -1 +1,3 @@ -source "lib/completions/diff.exp" +if {[assert_bash_type diff]} { + source "lib/completions/diff.exp" +}; # if diff --git a/test/completion/dir.exp b/test/completion/dir.exp index bcaefb54..2a435e0a 100644 --- a/test/completion/dir.exp +++ b/test/completion/dir.exp @@ -1 +1,3 @@ -source "lib/completions/dir.exp" +if {[assert_bash_type dir]} { + source "lib/completions/dir.exp" +}; # if diff --git a/test/completion/dropdb.exp b/test/completion/dropdb.exp index 01dc83c4..b65c7948 100644 --- a/test/completion/dropdb.exp +++ b/test/completion/dropdb.exp @@ -1 +1,3 @@ -source "lib/completions/dropdb.exp" +if {[assert_bash_type dropdb]} { + source "lib/completions/dropdb.exp" +}; # if diff --git a/test/completion/dselect.exp b/test/completion/dselect.exp index 6d014967..48dbe42d 100644 --- a/test/completion/dselect.exp +++ b/test/completion/dselect.exp @@ -1 +1,3 @@ -source "lib/completions/dselect.exp" +if {[assert_bash_type dselect]} { + source "lib/completions/dselect.exp" +}; # if diff --git a/test/completion/du.exp b/test/completion/du.exp index 277b5175..71a0e4a5 100644 --- a/test/completion/du.exp +++ b/test/completion/du.exp @@ -1 +1,3 @@ -source "lib/completions/du.exp" +if {[assert_bash_type du]} { + source "lib/completions/du.exp" +}; # if diff --git a/test/completion/dumpdb.exp b/test/completion/dumpdb.exp index 8d73b39d..085b7529 100644 --- a/test/completion/dumpdb.exp +++ b/test/completion/dumpdb.exp @@ -1 +1,3 @@ -source "lib/completions/dumpdb.exp" +if {[assert_bash_type dumpdb]} { + source "lib/completions/dumpdb.exp" +}; # if diff --git a/test/completion/evince.exp b/test/completion/evince.exp index 24815d58..95b0ca47 100644 --- a/test/completion/evince.exp +++ b/test/completion/evince.exp @@ -1 +1,3 @@ -source "lib/completions/evince.exp" +if {[assert_bash_type evince]} { + source "lib/completions/evince.exp" +}; # if diff --git a/test/completion/k3b.exp b/test/completion/k3b.exp index 6f11d398..8ea2952f 100644 --- a/test/completion/k3b.exp +++ b/test/completion/k3b.exp @@ -1 +1,3 @@ -source "lib/completions/k3b.exp" +if {[assert_bash_type k3b]} { + source "lib/completions/k3b.exp" +}; # if diff --git a/test/completion/kdvi.exp b/test/completion/kdvi.exp index d68cc8bb..37887d80 100644 --- a/test/completion/kdvi.exp +++ b/test/completion/kdvi.exp @@ -1 +1,3 @@ -source "lib/completions/kdvi.exp" +if {[assert_bash_type kdvi]} { + source "lib/completions/kdvi.exp" +}; # if diff --git a/test/completion/kill.exp b/test/completion/kill.exp index 6c5b5a3c..6a8a717a 100644 --- a/test/completion/kill.exp +++ b/test/completion/kill.exp @@ -1 +1,3 @@ -source "lib/completions/kill.exp" +if {[assert_bash_type kill]} { + source "lib/completions/kill.exp" +}; # if diff --git a/test/completion/kpdf.exp b/test/completion/kpdf.exp index 610c2775..2220c5f8 100644 --- a/test/completion/kpdf.exp +++ b/test/completion/kpdf.exp @@ -1 +1,3 @@ -source "lib/completions/kpdf.exp" +if {[assert_bash_type kpdf]} { + source "lib/completions/kpdf.exp" +}; # if diff --git a/test/completion/wtf.exp b/test/completion/wtf.exp index 97b5a0ee..4f202684 100644 --- a/test/completion/wtf.exp +++ b/test/completion/wtf.exp @@ -1 +1,3 @@ -source "lib/completions/wtf.exp" +if {[assert_bash_type wtf]} { + source "lib/completions/wtf.exp" +}; # if diff --git a/test/lib/completions/ant.exp b/test/lib/completions/ant.exp index d79abfd6..81294439 100644 --- a/test/lib/completions/ant.exp +++ b/test/lib/completions/ant.exp @@ -8,21 +8,13 @@ proc teardown {} { }; # teardown() -if {[assert_bash_type ant]} { +setup - setup +assert_complete_any "ant -" - assert_complete_any "ant -" - - - sync_after_int - - - teardown - - -}; # if +sync_after_int +teardown |