forked from enlightenment/efl
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:
parent
32df056a32
commit
013c0702f4
|
@ -69,7 +69,7 @@ ecore_imf_module_init(void)
|
||||||
|
|
||||||
modules_load = built_modules;
|
modules_load = built_modules;
|
||||||
env = getenv("ECORE_IMF_MODULE");
|
env = getenv("ECORE_IMF_MODULE");
|
||||||
if (env)
|
if ((env) && (env[0]))
|
||||||
{
|
{
|
||||||
modules_one[0] = env;
|
modules_one[0] = env;
|
||||||
modules_load = modules_one;
|
modules_load = modules_one;
|
||||||
|
@ -99,7 +99,7 @@ ecore_imf_module_init(void)
|
||||||
if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY")))
|
if ((!env) && (!getenv("WAYLAND_DISPLAY")) && (getenv("DISPLAY")))
|
||||||
env = "xim";
|
env = "xim";
|
||||||
#endif
|
#endif
|
||||||
if (env)
|
if ((env) && (env[0]))
|
||||||
{
|
{
|
||||||
const char **itr;
|
const char **itr;
|
||||||
Eina_Bool ok = EINA_FALSE;
|
Eina_Bool ok = EINA_FALSE;
|
||||||
|
|
|
@ -47,6 +47,7 @@ START_TEST(ecore_test_ecore_imf_modules)
|
||||||
Eina_List *modules;
|
Eina_List *modules;
|
||||||
const char **itr;
|
const char **itr;
|
||||||
|
|
||||||
|
putenv("ECORE_IMF_MODULE=");
|
||||||
ecore_imf_init();
|
ecore_imf_init();
|
||||||
modules = ecore_imf_context_available_ids_get();
|
modules = ecore_imf_context_available_ids_get();
|
||||||
|
|
||||||
|
@ -64,10 +65,10 @@ END_TEST
|
||||||
|
|
||||||
START_TEST(ecore_test_ecore_imf_modules_load)
|
START_TEST(ecore_test_ecore_imf_modules_load)
|
||||||
{
|
{
|
||||||
const char **itr;
|
const char **itr, *env;
|
||||||
|
|
||||||
|
putenv("ECORE_IMF_MODULE=");
|
||||||
ecore_imf_init();
|
ecore_imf_init();
|
||||||
|
|
||||||
for (itr = built_modules; *itr != NULL; itr++)
|
for (itr = built_modules; *itr != NULL; itr++)
|
||||||
{
|
{
|
||||||
Ecore_IMF_Context *ctx = ecore_imf_context_add(*itr);
|
Ecore_IMF_Context *ctx = ecore_imf_context_add(*itr);
|
||||||
|
|
Loading…
Reference in New Issue