diff options
author | Kevin Ballard <kevin@sb.org> | 2014-09-18 15:45:07 -0700 |
---|---|---|
committer | Kevin Ballard <kevin@sb.org> | 2014-09-18 15:46:17 -0700 |
commit | 0a32d96b270345af59ad1c807e9f001894d0bb81 (patch) | |
tree | 5b724d3300f6e44b16c71e61818cd8cf0899128f /tests/interactive.fish | |
parent | 174f5ba99ad633cf538ca0d2644418ea69fe9853 (diff) |
Reset fish_bind_mode when changing fish_key_bindings
Also avoid resetting bindings if fish_key_bindings is "modified" without
actually changing.
Fixes #1638.
Diffstat (limited to 'tests/interactive.fish')
-rw-r--r-- | tests/interactive.fish | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/interactive.fish b/tests/interactive.fish index 987ad80b..369b8546 100644 --- a/tests/interactive.fish +++ b/tests/interactive.fish @@ -15,20 +15,21 @@ for i in *.expect begin set -lx XDG_CONFIG_HOME $PWD/tmp.interactive.config set -lx TERM dumb - expect -n -c 'source interactive.expect.rc' -f $i >tmp.out ^tmp.err + expect -n -c 'source interactive.expect.rc' -f $i >$i.tmp.out ^$i.tmp.err end set -l tmp_status $status set res ok - if not diff tmp.out $i.out >/dev/null + mv -f interactive.tmp.log $i.tmp.log + if not diff $i.tmp.out $i.out >/dev/null set res fail echo "Output differs for file $i. Diff follows:" - diff -u tmp.out $i.out + diff -u $i.tmp.out $i.out end - if not diff tmp.err $i.err >/dev/null + if not diff $i.tmp.err $i.err >/dev/null set res fail echo "Error output differs for file $i. Diff follows:" - diff -u tmp.err $i.err + diff -u $i.tmp.err $i.err end if test $tmp_status != (cat $i.status) @@ -38,6 +39,8 @@ for i in *.expect if test $res = ok echo "File $i tested ok" + # clean up tmp files + rm -f $i.tmp.{err,out,log} else echo "File $i failed tests" end |