FS-11725 [core,test] Fix switch_core to allow MINIMAL core to load without freeswitch.xml. Fix test framework to exit if FreeSWITCH core fails to load.

This commit is contained in:
Chris Rienzo authored and Andrey Volk committed 2019-07-09 19:25:06 +04:00
1 parent 1d68ab18f4
commit 824356cc94
2 files changed
+23 -10

No files matched your search

+5 -2
View File
@@ -1992,8 +1992,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
switch_channel_global_init(runtime.memory_pool);
if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
apr_terminate();
return SWITCH_STATUS_MEMERR;
/* allow missing configuration if MINIMAL */
if (!(flags & SCF_MINIMAL)) {
apr_terminate();
return SWITCH_STATUS_MEMERR;
}
}
if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) {