aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/interactive.fish
diff options
context:
space:
mode:
authorGravatar Kevin Ballard <kevin@sb.org>2014-10-27 19:42:19 -0700
committerGravatar Kevin Ballard <kevin@sb.org>2014-11-24 01:51:07 -0800
commite13d423b680015a75371f849b8f4bd57f5f7663c (patch)
tree1915e6c43e220faa916970bd485b382fda56c7bf /tests/interactive.fish
parenteafd5776292c37d37870fc6013029f7146f34f70 (diff)
Tweak test runner to set up environment better
Update the test runners so they set up their own environment in test_util.fish. This simplifies the Makefile and paves the way for adding utility functions for use in the tests themselves.
Diffstat (limited to 'tests/interactive.fish')
-rw-r--r--tests/interactive.fish5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/interactive.fish b/tests/interactive.fish
index dbc9bf88..ad53e262 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -2,7 +2,7 @@
#
# Interactive tests using `expect`
-source test_util.fish
+source test_util.fish (status -f); or exit
say -o cyan "Testing interactive functionality"
if not type -q expect
@@ -13,7 +13,8 @@ end
function test_file
rm -Rf tmp.interactive.config; or die "Couldn't remove tmp.interactive.config"
mkdir -p tmp.interactive.config/fish; or die "Couldn't create tmp.interactive.config/fish"
- cp interactive.config tmp.interactive.config/fish/config.fish; or die "Couldn't create tmp.interactive.config/fish/config.fish"
+ cat $XDG_CONFIG_HOME/fish/config.fish interactive.config > tmp.interactive.config/fish/config.fish
+ or die "Couldn't create tmp.interactive.config/fish/config.fish"
set -l file $argv[1]