Merge branch 'master' of github.com:basho/wterl

Conflicts:
	c_src/build_deps.sh
This commit is contained in:
Gregory Burd 2012-06-04 09:18:15 +01:00
commit 57a70dc331
2 changed files with 2 additions and 2 deletions

Binary file not shown.

View file

@ -441,11 +441,11 @@ fetch_status(Cursor, {ok, Stat}, Acc) ->
simple_test_() ->
?assertCmd("rm -rf test/wterl-backend"),
application:set_env(wterl, data_root, "test/wterl-backend"),
riak_kv_backend:standard_test(?MODULE, []).
temp_riak_kv_backend:standard_test(?MODULE, []).
custom_config_test_() ->
?assertCmd("rm -rf test/wterl-backend"),
application:set_env(wterl, data_root, ""),
riak_kv_backend:standard_test(?MODULE, [{data_root, "test/wterl-backend"}]).
temp_riak_kv_backend:standard_test(?MODULE, [{data_root, "test/wterl-backend"}]).
-endif.