diff options
author | David Paleino <dapal@debian.org> | 2011-01-09 18:19:18 +0100 |
---|---|---|
committer | David Paleino <dapal@debian.org> | 2011-01-09 18:19:18 +0100 |
commit | a5e203cfe5bc335667900a3026a13e613152b50c (patch) | |
tree | cbc49be2e8062a929ddb2cfc56e15adfdcab2c49 /test/lib/completions/mount.exp | |
parent | bccf24e53240356343eb48c00cd256fb7ad2a39a (diff) | |
parent | fe2d7645df9f619a33feb8c8d7c89b1ea5fcad6b (diff) | |
download | bash-completion-a5e203cfe5bc335667900a3026a13e613152b50c.tar.gz |
Merge branch 'master' into 1.x
Conflicts:
CHANGES
configure.ac
Diffstat (limited to 'test/lib/completions/mount.exp')
-rw-r--r-- | test/lib/completions/mount.exp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/lib/completions/mount.exp b/test/lib/completions/mount.exp index 38d93e3b..c99d6058 100644 --- a/test/lib/completions/mount.exp +++ b/test/lib/completions/mount.exp @@ -5,11 +5,10 @@ proc setup_dummy_mnt {} { assert_bash_exec {unset COMPREPLY cur} assert_bash_exec {unset -f _mnt} - global TESTDIR assert_bash_exec { \ _mnt() { \ local cur=$(_get_cword); \ - _linux_fstab $(_get_pword) < "$TESTDIR/fixtures/mount/test-fstab"; \ + _linux_fstab $(_get_pword) < "$SRCDIRABS/fixtures/mount/test-fstab"; \ }; \ complete -F _mnt mnt \ } @@ -53,9 +52,9 @@ sync_after_int set test "Check completing nfs mounts" set expected [list /test/path /test/path2 /second/path] set cmd "mount mocksrv:/" -assert_bash_exec {OLDPATH="$PATH"; PATH="$TESTDIR/fixtures/mount/bin:$PATH";} +assert_bash_exec {OLDPATH="$PATH"; PATH="$SRCDIRABS/fixtures/mount/bin:$PATH";} # This needs an explicit cword param or will output "unresolved". -assert_complete $expected $cmd $test "/@" 20 "/" +assert_complete $expected $cmd $test -expect-cmd-minus / sync_after_int assert_bash_exec {PATH="$OLDPATH"; unset -v OLDPATH} @@ -94,7 +93,7 @@ assert_complete {/mnt/nice\ test\\path} {mnt /mnt/nice\ test\\p} sync_after_int assert_complete {{/mnt/nice\ test\\path} {/mnt/nice\ test-path}} \ - {mnt /mnt/nice\ } "" /@ 20 {/mnt/nice\ } + {mnt /mnt/nice\ } "" -expect-cmd-minus {/mnt/nice\ } sync_after_int assert_complete {/mnt/nice\$test-path} {mnt /mnt/nice\$} |