Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow secondary location for intercepts. #818

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

cmeiklejohn
Copy link
Contributor

Allow the configuration to specify an alternative location for intercept files, instead of assuming that they are located with riak_test/intercepts; this allows projects to keep related intercepts locally.

Allow the configuration to specify an alternative location for intercept files, instead of assuming that they are located with riak_test/intercepts; this allows projects to keep related intercepts locally.
@cmeiklejohn
Copy link
Contributor Author

cc: @macintux

@macintux macintux self-assigned this Aug 6, 2015
@@ -51,7 +51,7 @@ get_os_env(Var, Default) ->

%% @doc Load the configuration from the specified config file.
load(Config, undefined) ->
load(Config, filename:join([os:getenv("HOME"), ".riak_test.config"]));
load(Config, filename:join([os:getenv("PWD"), ".riak_test.config"]));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand the motivation, but shouldn't this be additive? Check pwd first, if it's not there, check HOME?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change shouldn't have made it in; this is a Lasp-specific change.

@macintux
Copy link
Contributor

Once you've reverted the PWD/HOME bit, this looks good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants