diff options
Diffstat (limited to 'test/unit/_filedir.exp')
| -rw-r--r-- | test/unit/_filedir.exp | 82 |
1 files changed, 3 insertions, 79 deletions
diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp index 7395bf9a..1de49504 100644 --- a/test/unit/_filedir.exp +++ b/test/unit/_filedir.exp @@ -1,6 +1,6 @@ proc setup {} { assert_bash_exec {unset COMPREPLY cur} - assert_bash_exec {unset -f _f _fd} + assert_bash_exec {unset -f _f} save_env # Declare bash completion function `_f' assert_bash_exec { \ @@ -11,16 +11,6 @@ proc setup {} { assert_bash_exec { \ complete -F _f -o filenames f2 \ } - # Declare bash completion function `_g' to complete on `.e1' files - assert_bash_exec { \ - _g() { local cur=$(_get_cword); unset COMPREPLY; _filedir e1; }; \ - complete -F _g g \ - } - # Declare bash completion function `_fd' to complete on dirs - assert_bash_exec { \ - _fd() { local cur=$(_get_cword); unset COMPREPLY; _filedir -d; }; \ - complete -F _fd fd \ - } # Create directories `a"b', `a*b', and `a\b' only when not running on # Cygwin/Windows (`"', `*', or `\' aren't allowed in filenames there) if {! [is_cygwin]} { @@ -41,8 +31,8 @@ proc teardown {} { assert_bash_exec {(cd $TESTDIR/tmp && rm -- a\*b/j && rmdir a\*b/ || true)} } assert_bash_exec {unset COMPREPLY cur} - assert_bash_exec {unset -f _f _g _fd} - assert_bash_exec {complete -r f g fd} + assert_bash_exec {unset -f _f} + assert_bash_exec {complete -r f} assert_env_unmodified { /OLDPWD/d /OLD_CTYPE/d @@ -55,21 +45,6 @@ setup foreach name {f f2} { - set test "completing $name ab/ should return e" - set cmd "$name ab/" - assert_complete_dir e $cmd "$::srcdir/fixtures/_filedir" $test - sync_after_int - - set test "completing $name a\\ b/ should return i" - set cmd "$name a\\ b/" - assert_complete_dir i $cmd "$::srcdir/fixtures/_filedir" $test - sync_after_int - - set test "completing $name a\\\'b/ should return c" - set cmd "$name a\\\'b/" - assert_complete_dir c $cmd "$::srcdir/fixtures/_filedir" $test - sync_after_int - set test "completing $name a\\\$b/ should return h" if {[info exists ::env(CI)] && [info exists ::env(DIST)] && $::env(DIST) == "centos6"} { xfail $test @@ -91,28 +66,6 @@ foreach name {f f2} { sync_after_int } - set test "completing $name a\\&b/ should return f" - set cmd "$name a\\&b/" - assert_complete_dir f $cmd "$::srcdir/fixtures/_filedir" $test - sync_after_int - - set test "completing $name a\$ should return a\\\$b/" - set cmd "$name a\$" - assert_complete_dir "\b\\\\\$b/" $cmd "$::srcdir/fixtures/_filedir" $test -nospace - sync_after_int - - set cmd "$name 'ab/" - assert_complete_dir {e'} $cmd "$::srcdir/fixtures/_filedir" - sync_after_int - - set cmd "$name 'a b/" - assert_complete_dir {i'} $cmd "$::srcdir/fixtures/_filedir" - sync_after_int - - set cmd "$name 'a\$b/" - assert_complete_dir {h'} $cmd "$::srcdir/fixtures/_filedir" - sync_after_int - if {! [is_cygwin]} { # Illegal characters in file/dir names set cmd "$name 'a\"b/"; #" assert_complete_dir {d'} $cmd "$TESTDIR/tmp" @@ -123,22 +76,6 @@ foreach name {f f2} { sync_after_int } - set cmd "$name 'a&b/" - assert_complete_dir {f'} $cmd "$::srcdir/fixtures/_filedir" - sync_after_int - - set cmd "$name \"ab/"; #" - assert_complete_dir {e"} $cmd "$::srcdir/fixtures/_filedir"; #" - sync_after_int - - set cmd "$name \"a b/"; #" - assert_complete_dir {i"} $cmd "$::srcdir/fixtures/_filedir"; #" - sync_after_int - - set cmd "$name \"a'b/"; #" - assert_complete_dir {c"} $cmd "$::srcdir/fixtures/_filedir"; #" - sync_after_int - if {! [is_cygwin]} { # Illegal characters in file/dir names set cmd "$name \"a\\\"b/"; #" assert_complete_dir {d"} $cmd "$TESTDIR/tmp"; #" @@ -161,20 +98,12 @@ foreach name {f f2} { assert_complete_dir {g"} $cmd "$TESTDIR/tmp"; #" sync_after_int - set cmd "$name \"a&b/"; #" - assert_complete_dir {f"} $cmd "$::srcdir/fixtures/_filedir"; #" - sync_after_int - set cmd "$name \\\[x" assert_complete_dir {\[x\]} $cmd "$::srcdir/fixtures/_filedir/brackets" sync_after_int }; # foreach -set test "completing with filter '.e1' should show completions" -assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "$::srcdir/fixtures/_filedir/ext" $test -sync_after_int - set test "completing f aé should return g" # Execute this test only with LC_CTYPE matching *UTF-8* # See also: http://www.mail-archive.com/bash-completion-devel\ @@ -191,10 +120,5 @@ if { } sync_after_int -set test "completing fd a\\ should return a\\ b/" -set cmd "fd a\\ " -assert_complete_dir "a\\ b/" $cmd "$::srcdir/fixtures/_filedir" $test -nospace -sync_after_int - teardown |