diff options
| author |  Kevin Ballard <kevin@sb.org> | 2014-10-27 19:42:19 -0700 |
|---|---|---|
| committer | Kevin Ballard <kevin@sb.org> | 2014-11-24 01:51:07 -0800 |
| commit | e13d423b680015a75371f849b8f4bd57f5f7663c (patch) | |
| tree | 1915e6c43e220faa916970bd485b382fda56c7bf /Makefile.in | |
| parent | eafd5776292c37d37870fc6013029f7146f34f70 (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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 24e46176..722d6117 100644 --- a/Makefile.in +++ b/Makefile.in @@ -315,20 +315,14 @@ test_low_level: fish_tests $(call filter_up_to,test_low_level,$(active_test_goal test_high_level: test_fishscript test_interactive .PHONY: test_high_level -test_fishscript: $(PROGRAMS) test_fishscript_config $(call filter_up_to,test_fishscript,$(active_test_goals)) - cd tests; XDG_CONFIG_HOME="$$PWD"/tmp.config ../fish test.fish +test_fishscript: $(PROGRAMS) $(call filter_up_to,test_fishscript,$(active_test_goals)) + cd tests && ../fish test.fish .PHONY: test_fishscript -test_interactive: $(PROGRAMS) test_fishscript_config $(call filter_up_to,test_interactive,$(active_test_goals)) - cd tests; XDG_CONFIG_HOME="$$PWD"/tmp.config ../fish interactive.fish +test_interactive: $(PROGRAMS) $(call filter_up_to,test_interactive,$(active_test_goals)) + cd tests && ../fish interactive.fish .PHONY: test_interactive -test_fishscript_config: - @rm -rf tests/tmp.config - @mkdir -p tests/tmp.config/fish - @echo 'set fish_function_path "$$PWD/../share/functions"' > tests/tmp.config/fish/config.fish -.PHONY: test_fishscript_config - # # commands.hdr collects documentation on all commands, functions and # builtins |