From e13d423b680015a75371f849b8f4bd57f5f7663c Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 27 Oct 2014 19:42:19 -0700 Subject: 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. --- tests/interactive.fish | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/interactive.fish') 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] -- cgit v1.2.3