Handle test_cfg_register daemon path in special way During make distcheck test_cfg_register binary become separated from others fixtures and becomes available by ?BUILDDIR path, not ?SOURCEDIR as others are.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/62f05601 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/62f05601 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/62f05601 Branch: refs/heads/1963-eunit Commit: 62f05601594c12c277dd50218e749b6bc79b8258 Parents: b8138be Author: Alexander Shorin <[email protected]> Authored: Mon Jun 23 00:20:29 2014 +0400 Committer: Alexander Shorin <[email protected]> Committed: Mon Jun 23 03:31:26 2014 +0400 ---------------------------------------------------------------------- test/couchdb/couchdb_os_daemons_tests.erl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/62f05601/test/couchdb/couchdb_os_daemons_tests.erl ---------------------------------------------------------------------- diff --git a/test/couchdb/couchdb_os_daemons_tests.erl b/test/couchdb/couchdb_os_daemons_tests.erl index e988548..1058a78 100644 --- a/test/couchdb/couchdb_os_daemons_tests.erl +++ b/test/couchdb/couchdb_os_daemons_tests.erl @@ -40,8 +40,13 @@ setup(DName) -> {ok, CfgPid} = couch_config:start_link(?CONFIG_CHAIN), {ok, OsDPid} = couch_os_daemons:start_link(), - couch_config:set("os_daemons", DName, - filename:join([?FIXTURESDIR, DName]), false), + Path = case DName of + ?DAEMON_CFGREG -> + filename:join([?BUILDDIR, "test", "couchdb", "fixtures", DName]); + _ -> + filename:join([?FIXTURESDIR, DName]) + end, + couch_config:set("os_daemons", DName, Path, false), timer:sleep(?DELAY), % sleep a bit to let daemon set kill flag {CfgPid, OsDPid}.
