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. --- Makefile.in | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Makefile.in') 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 -- cgit v1.2.3