hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_imf - fix make check to doa "load all" check after de-sillifying it 

this should make ecore_imf testable with empty env vars also meaning
no env var and the make check test will now ensuree this is set to
exactly test this.
This commit is contained in:
Carsten Haitzler 2016-08-05 13:40:30 +09:00
parent 32df056a32
commit 013c0702f4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ecore_imf/ecore_imf_module.c
View File

@ -69,7 +69,7 @@ ecore_imf_module_init(void)
modules_load = built_modules;
env = getenv("ECORE_IMF_MODULE");
if (env)
if ((env) && (env[0]))
{
modules_one[0] = env;
modules_load = modules_one;
@ -99,7 +99,7 @@ ecore_imf_module_init(void)
if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY")))
env = "xim";
#endif
if (env)
if ((env) && (env[0]))
{
const char **itr;
Eina_Bool ok = EINA_FALSE;

5
src/tests/ecore/ecore_test_ecore_imf.c
View File

@ -47,6 +47,7 @@ START_TEST(ecore_test_ecore_imf_modules)
Eina_List *modules;
const char **itr;
putenv("ECORE_IMF_MODULE=");
ecore_imf_init();
modules = ecore_imf_context_available_ids_get();
@ -64,10 +65,10 @@ END_TEST
START_TEST(ecore_test_ecore_imf_modules_load)
{
const char **itr;
const char **itr, *env;
putenv("ECORE_IMF_MODULE=");
ecore_imf_init();
for (itr = built_modules; *itr != NULL; itr++)
{
Ecore_IMF_Context *ctx = ecore_imf_context_add(*itr);