kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Unit-tests] Fix xml error not finding freeswitch.xml on FST_MINCORE_BEGIN

This commit is contained in:
Andrey Volk 2019-11-22 01:14:12 +04:00
parent 3de3ec3b1a
commit 2865603ad2
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/test/switch_test.h
View File

@ -308,7 +308,7 @@ static switch_status_t fst_init_core_and_modload(const char *confdir, const char
/** /**
* Minimal FS core load * Minimal FS core load
*/ */
#define FST_MINCORE_BEGIN() \ #define FST_MINCORE_BEGIN(confdir) \
FCT_BGN() \ FCT_BGN() \
{ \ { \
int fst_core = 0; \ int fst_core = 0; \
@ -317,7 +317,7 @@ static switch_status_t fst_init_core_and_modload(const char *confdir, const char
switch_memory_pool_t *fst_pool = NULL; \ switch_memory_pool_t *fst_pool = NULL; \
int fst_timer_started = 0; \ int fst_timer_started = 0; \
fst_getenv_default("FST_SUPPRESS_UNUSED_STATIC_WARNING", NULL, SWITCH_FALSE); \ fst_getenv_default("FST_SUPPRESS_UNUSED_STATIC_WARNING", NULL, SWITCH_FALSE); \
if (fst_init_core_and_modload(".", NULL, 1) == SWITCH_STATUS_SUCCESS) { /* minimal load */ \ if (fst_init_core_and_modload(confdir, NULL, 1) == SWITCH_STATUS_SUCCESS) { /* minimal load */ \
fst_core = 1; \ fst_core = 1; \
} else { \ } else { \
fprintf(stderr, "Failed to load FS core\n"); \ fprintf(stderr, "Failed to load FS core\n"); \

2
src/mod/endpoints/mod_sofia/test/test_sofia_funcs.c
View File

@ -33,7 +33,7 @@
#include <test/switch_test.h> #include <test/switch_test.h>
#include "../mod_sofia.c" #include "../mod_sofia.c"
FST_MINCORE_BEGIN() FST_MINCORE_BEGIN("./conf")
FST_SUITE_BEGIN(switch_hash) FST_SUITE_BEGIN(switch_hash)

2
tests/unit/switch_console.c
View File

@ -33,7 +33,7 @@
#include <switch.h> #include <switch.h>
#include <test/switch_test.h> #include <test/switch_test.h>
FST_MINCORE_BEGIN() FST_MINCORE_BEGIN("./conf")
FST_SUITE_BEGIN(SWITCH_STANDARD_STREAM) FST_SUITE_BEGIN(SWITCH_STANDARD_STREAM)

2
tests/unit/switch_event.c
View File

@ -4,7 +4,7 @@
// #define BENCHMARK 1 // #define BENCHMARK 1
FST_MINCORE_BEGIN() FST_MINCORE_BEGIN("./conf")
FST_SUITE_BEGIN(switch_event) FST_SUITE_BEGIN(switch_event)

2
tests/unit/switch_hash.c
View File

@ -4,7 +4,7 @@
// #define BENCHMARK 1 // #define BENCHMARK 1
FST_MINCORE_BEGIN() FST_MINCORE_BEGIN("./conf")
FST_SUITE_BEGIN(switch_hash) FST_SUITE_BEGIN(switch_hash)

2
tests/unit/switch_utils.c
View File

@ -33,7 +33,7 @@
#include <switch.h> #include <switch.h>
#include <test/switch_test.h> #include <test/switch_test.h>
FST_MINCORE_BEGIN() FST_MINCORE_BEGIN("./conf")
FST_SUITE_BEGIN(switch_hash) FST_SUITE_BEGIN(switch_hash)