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

diff --git a/src/include/test/switch_test.h b/src/include/test/switch_test.h
index 1cf1ff94ff0f9795d9569f48bd9ae9a7b55f13f4..98a1bd068c42c249c0a765400236b2dfddbaf125 100644 (file)
--- a/src/include/test/switch_test.h
+++ b/src/include/test/switch_test.h
@@ -308,7 +308,7 @@ static switch_status_t fst_init_core_and_modload(const char *confdir, const char
 /**
  * Minimal FS core load
  */
-#define FST_MINCORE_BEGIN() \
+#define FST_MINCORE_BEGIN(confdir) \
        FCT_BGN() \
        { \
                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; \
                int fst_timer_started = 0; \
                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; \
                } else { \
                        fprintf(stderr, "Failed to load FS core\n"); \

diff --git a/src/mod/endpoints/mod_sofia/test/test_sofia_funcs.c b/src/mod/endpoints/mod_sofia/test/test_sofia_funcs.c
index f55649c5cf0f726ddac88e5820d5e27e710a7f5c..e5b1baa932c0ee4bfe5372e289a7e37d248bedd1 100644 (file)
--- a/src/mod/endpoints/mod_sofia/test/test_sofia_funcs.c
+++ b/src/mod/endpoints/mod_sofia/test/test_sofia_funcs.c
@@ -33,7 +33,7 @@
 #include <test/switch_test.h>
 #include "../mod_sofia.c"
 
-FST_MINCORE_BEGIN()
+FST_MINCORE_BEGIN("./conf")
 
 FST_SUITE_BEGIN(switch_hash)
 

diff --git a/tests/unit/switch_console.c b/tests/unit/switch_console.c
index 547b6f01eef3aa95282abe9369e486cd04653aed..9a3e9cfdc8fbcc79faa5c95537a491d1ac1262f7 100644 (file)
--- a/tests/unit/switch_console.c
+++ b/tests/unit/switch_console.c
@@ -33,7 +33,7 @@
 #include <switch.h>
 #include <test/switch_test.h>
 
-FST_MINCORE_BEGIN()
+FST_MINCORE_BEGIN("./conf")
 
 FST_SUITE_BEGIN(SWITCH_STANDARD_STREAM)
 

diff --git a/tests/unit/switch_event.c b/tests/unit/switch_event.c
index 1f55b574b92c85ca5501920367ffe58aa7ac3b12..69410cec489df015b94e158075fd4f1bf43f67dc 100644 (file)
--- a/tests/unit/switch_event.c
+++ b/tests/unit/switch_event.c
@@ -4,7 +4,7 @@
 
 // #define BENCHMARK 1
 
-FST_MINCORE_BEGIN()
+FST_MINCORE_BEGIN("./conf")
 
 FST_SUITE_BEGIN(switch_event)
 

diff --git a/tests/unit/switch_hash.c b/tests/unit/switch_hash.c
index 43d3e186922ea2d97913236b15d6ecc2b3a32d73..e0de4079175fc9b937c62b89f229e17654b12aeb 100644 (file)
--- a/tests/unit/switch_hash.c
+++ b/tests/unit/switch_hash.c
@@ -4,7 +4,7 @@
 
 // #define BENCHMARK 1
 
-FST_MINCORE_BEGIN()
+FST_MINCORE_BEGIN("./conf")
 
 FST_SUITE_BEGIN(switch_hash)
 

diff --git a/tests/unit/switch_utils.c b/tests/unit/switch_utils.c
index 177d14c6ba0a00ef0f7331dc9ecf5684b2b058ff..72c5817b71c5a8342f95803b185a04222a62d4b0 100644 (file)
--- a/tests/unit/switch_utils.c
+++ b/tests/unit/switch_utils.c
@@ -33,7 +33,7 @@
 #include <switch.h>
 #include <test/switch_test.h>
 
-FST_MINCORE_BEGIN()
+FST_MINCORE_BEGIN("./conf")
 
 FST_SUITE_BEGIN(switch_hash)