Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Better certfile location detection by the test suite

This commit is contained in:
Evgeniy Khramtsov 2013-06-15 01:23:57 +10:00 committed by Alexey Shchepin
parent 2f7d27677e
commit c9efdf6167
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/ejabberd_SUITE.erl
View File

@ -37,6 +37,8 @@ init_per_suite(Config) ->
SASLPath = filename:join([PrivDir, "sasl.log"]), SASLPath = filename:join([PrivDir, "sasl.log"]),
MnesiaDir = filename:join([PrivDir, "mnesia"]), MnesiaDir = filename:join([PrivDir, "mnesia"]),
CertFile = filename:join([DataDir, "cert.pem"]), CertFile = filename:join([DataDir, "cert.pem"]),
{ok, CWD} = file:get_cwd(),
{ok, _} = file:copy(CertFile, filename:join([CWD, "cert.pem"])),
application:set_env(ejabberd, config, ConfigPath), application:set_env(ejabberd, config, ConfigPath),
application:set_env(ejabberd, log_path, LogPath), application:set_env(ejabberd, log_path, LogPath),
application:set_env(sasl, sasl_error_logger, {file, SASLPath}), application:set_env(sasl, sasl_error_logger, {file, SASLPath}),

2
test/ejabberd_SUITE_data/ejabberd.cfg
View File

@ -1,6 +1,6 @@
{loglevel, 4}. {loglevel, 4}.
{hosts, ["localhost"]}. {hosts, ["localhost"]}.
{define_macro, 'CERTFILE', "../../test/ejabberd_SUITE_data/cert.pem"}. {define_macro, 'CERTFILE', "cert.pem"}.
{listen, {listen,
[ [
{5222, ejabberd_c2s, [ {5222, ejabberd_c2s, [