summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/bin/edje/edje_cc_out.c2
-rw-r--r--src/bin/edje/edje_cc_parse.c2
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c2
-rw-r--r--src/lib/ecore/ecore.c2
-rw-r--r--src/lib/ecore_con/ecore_con_proxy_helper.c4
-rw-r--r--src/lib/ecore_evas/ecore_evas_module.c10
-rw-r--r--src/lib/ecore_imf/ecore_imf_module.c2
-rw-r--r--src/lib/edje/edje_edit.c2
-rw-r--r--src/lib/edje/edje_module.c8
-rw-r--r--src/lib/eeze/eeze_sensor.c2
-rw-r--r--src/lib/elementary/elm_module.c2
-rw-r--r--src/lib/elementary/elm_web2.c2
-rw-r--r--src/lib/emotion/emotion_modules.c2
-rw-r--r--src/lib/ethumb/ethumb.c2
-rw-r--r--src/lib/evas/file/evas_module.c12
-rw-r--r--src/tests/ecore/ecore_suite.c2
-rw-r--r--src/tests/ecore_con/ecore_con_suite.c2
-rw-r--r--src/tests/ector/suite/ector_suite.c2
-rw-r--r--src/tests/edje/edje_suite.c2
-rw-r--r--src/tests/eet/eet_suite.c2
-rw-r--r--src/tests/eeze/eeze_suite.c2
-rw-r--r--src/tests/efreet/efreet_suite.c2
-rw-r--r--src/tests/eina/eina_suite.c2
-rw-r--r--src/tests/eio/eio_suite.c2
-rw-r--r--src/tests/eldbus/eldbus_suite.c2
-rw-r--r--src/tests/elementary/elm_suite.c2
-rw-r--r--src/tests/elocation/elocation_suite.c2
-rw-r--r--src/tests/elput/elput_suite.c2
-rw-r--r--src/tests/elua/elua_suite.c2
-rw-r--r--src/tests/emile/emile_suite.c2
-rw-r--r--src/tests/eo/suite/eo_suite.c2
-rw-r--r--src/tests/eolian/eolian_suite.c2
-rw-r--r--src/tests/evas/evas_suite.c2
-rw-r--r--src/tests/evil/evil_suite.c2
35 files changed, 95 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index a4e6dff3a9..68d608d203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5566,6 +5566,7 @@ AC_ARG_ENABLE([cancel-ok],
5566 ],[]) 5566 ],[])
5567AC_SUBST(ELM_EDJE_DEFINES) 5567AC_SUBST(ELM_EDJE_DEFINES)
5568 5568
5569AC_DEFINE([NEED_RUN_IN_TREE], [1], [Need EFL_RUN_IN_TREE=1 trick])
5569 5570
5570## Disable warning for OS that have a specifc configuration 5571## Disable warning for OS that have a specifc configuration
5571case "$host_os" in 5572case "$host_os" in
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 7c483b5939..1d33bdd012 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -2221,6 +2221,7 @@ data_write_scripts(Eet_File *ef)
2221#else 2221#else
2222# define BIN_EXT 2222# define BIN_EXT
2223#endif 2223#endif
2224#ifdef NEED_RUN_IN_TREE
2224 if (getenv("EFL_RUN_IN_TREE")) 2225 if (getenv("EFL_RUN_IN_TREE"))
2225 { 2226 {
2226 snprintf(embryo_cc_path, sizeof(embryo_cc_path), 2227 snprintf(embryo_cc_path, sizeof(embryo_cc_path),
@@ -2231,6 +2232,7 @@ data_write_scripts(Eet_File *ef)
2231 if (!ecore_file_exists(embryo_cc_path)) 2232 if (!ecore_file_exists(embryo_cc_path))
2232 embryo_cc_path[0] = '\0'; 2233 embryo_cc_path[0] = '\0';
2233 } 2234 }
2235#endif
2234 2236
2235 if (embryo_cc_path[0] == '\0') 2237 if (embryo_cc_path[0] == '\0')
2236 { 2238 {
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index c30f598317..c55738d809 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -1050,6 +1050,7 @@ compile(void)
1050 */ 1050 */
1051 1051
1052 buf2[0] = '\0'; 1052 buf2[0] = '\0';
1053#ifdef NEED_RUN_IN_TREE
1053 if (getenv("EFL_RUN_IN_TREE")) 1054 if (getenv("EFL_RUN_IN_TREE"))
1054 { 1055 {
1055 snprintf(buf2, sizeof(buf2), 1056 snprintf(buf2, sizeof(buf2),
@@ -1058,6 +1059,7 @@ compile(void)
1058 if (!ecore_file_exists(buf2)) 1059 if (!ecore_file_exists(buf2))
1059 buf2[0] = '\0'; 1060 buf2[0] = '\0';
1060 } 1061 }
1062#endif
1061 1063
1062 if (buf2[0] == '\0') 1064 if (buf2[0] == '\0')
1063 snprintf(buf2, sizeof(buf2), 1065 snprintf(buf2, sizeof(buf2),
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 0d94b249a7..2cacbe5bf9 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -572,6 +572,7 @@ parseoptions(int argc, char **argv, char *iname, char *oname,
572 int i, stack_size; 572 int i, stack_size;
573 size_t len; 573 size_t len;
574 574
575#ifdef NEED_RUN_IN_TREE
575 str[0] = '\0'; 576 str[0] = '\0';
576 if (getenv("EFL_RUN_IN_TREE")) 577 if (getenv("EFL_RUN_IN_TREE"))
577 { 578 {
@@ -582,6 +583,7 @@ parseoptions(int argc, char **argv, char *iname, char *oname,
582 } 583 }
583 584
584 if (str[0] == '\0') 585 if (str[0] == '\0')
586#endif
585 snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get()); 587 snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
586 588
587 /* use embryo include dir always */ 589 /* use embryo include dir always */
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 9d4270a228..6c0a31e185 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -137,6 +137,7 @@ ecore_system_modules_load(void)
137{ 137{
138 char buf[PATH_MAX] = ""; 138 char buf[PATH_MAX] = "";
139 139
140#ifdef NEED_RUN_IN_TREE
140#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 141#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
141 if (getuid() == geteuid()) 142 if (getuid() == geteuid())
142#endif 143#endif
@@ -173,6 +174,7 @@ ecore_system_modules_load(void)
173 } 174 }
174 } 175 }
175 } 176 }
177#endif
176 178
177 snprintf(buf, sizeof(buf), "%s/ecore/system", 179 snprintf(buf, sizeof(buf), "%s/ecore/system",
178 eina_prefix_lib_get(_ecore_pfx)); 180 eina_prefix_lib_get(_ecore_pfx));
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index eda91e9989..8fb9e0ff6a 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -57,10 +57,13 @@ _efl_net_proxy_helper_spawn(void)
57 char buf[PATH_MAX]; 57 char buf[PATH_MAX];
58 Eina_List *l; 58 Eina_List *l;
59 Efl_Net_Proxy_Helper_Req *req; 59 Efl_Net_Proxy_Helper_Req *req;
60#ifdef NEED_RUN_IN_TREE
60 static int run_in_tree = -1; 61 static int run_in_tree = -1;
62#endif
61 63
62 if (!_efl_net_proxy_helper_works) return; 64 if (!_efl_net_proxy_helper_works) return;
63 if (_efl_net_proxy_helper_exe) return; 65 if (_efl_net_proxy_helper_exe) return;
66#ifdef NEED_RUN_IN_TREE
64 if (run_in_tree == -1) 67 if (run_in_tree == -1)
65 { 68 {
66 run_in_tree = 0; 69 run_in_tree = 0;
@@ -77,6 +80,7 @@ _efl_net_proxy_helper_spawn(void)
77 (buf, sizeof(buf), 80 (buf, sizeof(buf),
78 PACKAGE_BUILD_DIR"/src/bin/ecore_con/utils/efl_net_proxy_helper"HELPER_EXT); 81 PACKAGE_BUILD_DIR"/src/bin/ecore_con/utils/efl_net_proxy_helper"HELPER_EXT);
79 else 82 else
83#endif
80 snprintf 84 snprintf
81 (buf, sizeof(buf), 85 (buf, sizeof(buf),
82 "%s/ecore_con/utils/"MODULE_ARCH"/efl_net_proxy_helper"HELPER_EXT, 86 "%s/ecore_con/utils/"MODULE_ARCH"/efl_net_proxy_helper"HELPER_EXT,
diff --git a/src/lib/ecore_evas/ecore_evas_module.c b/src/lib/ecore_evas/ecore_evas_module.c
index a587ee93aa..71ca38a0f5 100644
--- a/src/lib/ecore_evas/ecore_evas_module.c
+++ b/src/lib/ecore_evas/ecore_evas_module.c
@@ -57,6 +57,7 @@ _ecore_evas_vnc_server_module_load(void)
57 if (_ecore_evas_vnc) 57 if (_ecore_evas_vnc)
58 return _ecore_evas_vnc; 58 return _ecore_evas_vnc;
59 59
60#ifdef NEED_RUN_IN_TREE
60#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 61#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
61 if (getuid() == geteuid()) 62 if (getuid() == geteuid())
62#endif 63#endif
@@ -71,6 +72,7 @@ _ecore_evas_vnc_server_module_load(void)
71 return _ecore_evas_vnc; 72 return _ecore_evas_vnc;
72 } 73 }
73 } 74 }
75#endif
74 76
75 prefix = eina_module_symbol_path_get(_ecore_evas_vnc_server_module_load, 77 prefix = eina_module_symbol_path_get(_ecore_evas_vnc_server_module_load,
76 "/ecore_evas"); 78 "/ecore_evas");
@@ -93,19 +95,24 @@ _ecore_evas_engine_load(const char *engine)
93 const char *path; 95 const char *path;
94 Eina_List *l; 96 Eina_List *l;
95 Eina_Module *em = NULL; 97 Eina_Module *em = NULL;
98#ifdef NEED_RUN_IN_TREE
96 Eina_Bool run_in_tree; 99 Eina_Bool run_in_tree;
100#endif
97 101
98 EINA_SAFETY_ON_NULL_RETURN_VAL(engine, NULL); 102 EINA_SAFETY_ON_NULL_RETURN_VAL(engine, NULL);
99 103
100 em = (Eina_Module *)eina_hash_find(_registered_engines, engine); 104 em = (Eina_Module *)eina_hash_find(_registered_engines, engine);
101 if (em) return em; 105 if (em) return em;
102 106
107#ifdef NEED_RUN_IN_TREE
103 run_in_tree = !!getenv("EFL_RUN_IN_TREE"); 108 run_in_tree = !!getenv("EFL_RUN_IN_TREE");
109#endif
104 110
105 EINA_LIST_FOREACH(_engines_paths, l, path) 111 EINA_LIST_FOREACH(_engines_paths, l, path)
106 { 112 {
107 char tmp[PATH_MAX] = ""; 113 char tmp[PATH_MAX] = "";
108 114
115#ifdef NEED_RUN_IN_TREE
109#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 116#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
110 if (getuid() == geteuid()) 117 if (getuid() == geteuid())
111#endif 118#endif
@@ -119,6 +126,7 @@ _ecore_evas_engine_load(const char *engine)
119 tmp[0] = '\0'; 126 tmp[0] = '\0';
120 } 127 }
121 } 128 }
129#endif
122 130
123 if (tmp[0] == '\0') 131 if (tmp[0] == '\0')
124 snprintf(tmp, sizeof(tmp), "%s/%s/%s/%s", 132 snprintf(tmp, sizeof(tmp), "%s/%s/%s/%s",
@@ -150,6 +158,7 @@ _ecore_evas_engine_init(void)
150// _registered_engines = eina_hash_string_small_new(EINA_FREE_CB(eina_module_free)); 158// _registered_engines = eina_hash_string_small_new(EINA_FREE_CB(eina_module_free));
151 _registered_engines = eina_hash_string_small_new(NULL); 159 _registered_engines = eina_hash_string_small_new(NULL);
152 160
161#ifdef NEED_RUN_IN_TREE
153#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 162#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
154 if (getuid() == geteuid()) 163 if (getuid() == geteuid())
155#endif 164#endif
@@ -165,6 +174,7 @@ _ecore_evas_engine_init(void)
165 } 174 }
166 } 175 }
167 } 176 }
177#endif
168 178
169 /* 1. libecore_evas.so/../ecore_evas/engines/ */ 179 /* 1. libecore_evas.so/../ecore_evas/engines/ */
170 paths[0] = eina_module_symbol_path_get(_ecore_evas_engine_init, "/ecore_evas/engines"); 180 paths[0] = eina_module_symbol_path_get(_ecore_evas_engine_init, "/ecore_evas/engines");
diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index 1d5747ebfe..7ec902a233 100644
--- a/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
@@ -52,6 +52,7 @@ ecore_imf_module_init(void)
52 "ECORE_IMF", "ecore_imf", "checkme", 52 "ECORE_IMF", "ecore_imf", "checkme",
53 PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, 53 PACKAGE_BIN_DIR, PACKAGE_LIB_DIR,
54 PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); 54 PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
55#ifdef NEED_RUN_IN_TREE
55#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 56#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
56 if (getuid() == geteuid()) 57 if (getuid() == geteuid())
57#endif 58#endif
@@ -88,6 +89,7 @@ ecore_imf_module_init(void)
88 } 89 }
89 } 90 }
90 } 91 }
92#endif
91 93
92 env = getenv("ECORE_IMF_MODULE"); 94 env = getenv("ECORE_IMF_MODULE");
93#ifdef BUILD_ECORE_IMF_WAYLAND 95#ifdef BUILD_ECORE_IMF_WAYLAND
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index ee7c11997e..aaeb3a8a69 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -12469,6 +12469,7 @@ _edje_edit_embryo_rebuild(Edje_Edit *eed)
12469#else 12469#else
12470# define BIN_EXT 12470# define BIN_EXT
12471#endif 12471#endif
12472#ifdef NEED_RUN_IN_TREE
12472#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 12473#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
12473 if (getuid() == geteuid()) 12474 if (getuid() == geteuid())
12474#endif 12475#endif
@@ -12484,6 +12485,7 @@ _edje_edit_embryo_rebuild(Edje_Edit *eed)
12484 embryo_cc_path[0] = '\0'; 12485 embryo_cc_path[0] = '\0';
12485 } 12486 }
12486 } 12487 }
12488#endif
12487 12489
12488 if (embryo_cc_path[0] == '\0') 12490 if (embryo_cc_path[0] == '\0')
12489 { 12491 {
diff --git a/src/lib/edje/edje_module.c b/src/lib/edje/edje_module.c
index cfd30088f2..68d3caa5ee 100644
--- a/src/lib/edje/edje_module.c
+++ b/src/lib/edje/edje_module.c
@@ -24,19 +24,24 @@ _edje_module_handle_load(const char *module)
24 const char *path; 24 const char *path;
25 Eina_List *l; 25 Eina_List *l;
26 Eina_Module *em = NULL; 26 Eina_Module *em = NULL;
27#ifdef NEED_RUN_IN_TREE
27 Eina_Bool run_in_tree; 28 Eina_Bool run_in_tree;
29#endif
28 30
29 EINA_SAFETY_ON_NULL_RETURN_VAL(module, NULL); 31 EINA_SAFETY_ON_NULL_RETURN_VAL(module, NULL);
30 32
31 em = (Eina_Module *)eina_hash_find(_registered_modules, module); 33 em = (Eina_Module *)eina_hash_find(_registered_modules, module);
32 if (em) return em; 34 if (em) return em;
33 35
36#ifdef NEED_RUN_IN_TREE
34 run_in_tree = !!getenv("EFL_RUN_IN_TREE"); 37 run_in_tree = !!getenv("EFL_RUN_IN_TREE");
38#endif
35 39
36 EINA_LIST_FOREACH(_modules_paths, l, path) 40 EINA_LIST_FOREACH(_modules_paths, l, path)
37 { 41 {
38 char tmp[PATH_MAX] = ""; 42 char tmp[PATH_MAX] = "";
39 43
44#ifdef NEED_RUN_IN_TREE
40#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 45#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
41 if (getuid() == geteuid()) 46 if (getuid() == geteuid())
42#endif 47#endif
@@ -50,6 +55,7 @@ _edje_module_handle_load(const char *module)
50 tmp[0] = '\0'; 55 tmp[0] = '\0';
51 } 56 }
52 } 57 }
58#endif
53 59
54 if (tmp[0] == '\0') 60 if (tmp[0] == '\0')
55 snprintf(tmp, sizeof(tmp), "%s/%s/%s/%s", 61 snprintf(tmp, sizeof(tmp), "%s/%s/%s/%s",
@@ -79,6 +85,7 @@ _edje_module_init(void)
79 85
80 _registered_modules = eina_hash_string_small_new(EINA_FREE_CB(eina_module_free)); 86 _registered_modules = eina_hash_string_small_new(EINA_FREE_CB(eina_module_free));
81 87
88#ifdef NEED_RUN_IN_TREE
82#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 89#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
83 if (getuid() == geteuid()) 90 if (getuid() == geteuid())
84#endif 91#endif
@@ -94,6 +101,7 @@ _edje_module_init(void)
94 } 101 }
95 } 102 }
96 } 103 }
104#endif
97 105
98 /* 1. libedje.so/../edje/modules/ */ 106 /* 1. libedje.so/../edje/modules/ */
99 paths[0] = eina_module_symbol_path_get(_edje_module_init, "/edje/modules"); 107 paths[0] = eina_module_symbol_path_get(_edje_module_init, "/edje/modules");
diff --git a/src/lib/eeze/eeze_sensor.c b/src/lib/eeze/eeze_sensor.c
index 32f7a78042..284f7885e6 100644
--- a/src/lib/eeze/eeze_sensor.c
+++ b/src/lib/eeze/eeze_sensor.c
@@ -104,6 +104,7 @@ eeze_sensor_modules_load(void)
104 * is one of these items. We do load the modules from the builddir if the 104 * is one of these items. We do load the modules from the builddir if the
105 * environment is set. Normal case is to use installed modules from system 105 * environment is set. Normal case is to use installed modules from system
106 */ 106 */
107#ifdef NEED_RUN_IN_TREE
107 if ( 108 if (
108#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 109#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
109 (getuid() == geteuid()) && 110 (getuid() == geteuid()) &&
@@ -122,6 +123,7 @@ eeze_sensor_modules_load(void)
122 } 123 }
123 } 124 }
124 else 125 else
126#endif
125 { 127 {
126 snprintf(buf, sizeof(buf), "%s/eeze/modules/sensor", 128 snprintf(buf, sizeof(buf), "%s/eeze/modules/sensor",
127 eina_prefix_lib_get(pfx)); 129 eina_prefix_lib_get(pfx));
diff --git a/src/lib/elementary/elm_module.c b/src/lib/elementary/elm_module.c
index febb15ec5c..03f70dc032 100644
--- a/src/lib/elementary/elm_module.c
+++ b/src/lib/elementary/elm_module.c
@@ -131,12 +131,14 @@ _elm_module_load(Elm_Module *m)
131 if (m->module) return EINA_TRUE; 131 if (m->module) return EINA_TRUE;
132 if (strchr(m->name, '/')) return EINA_FALSE; 132 if (strchr(m->name, '/')) return EINA_FALSE;
133 133
134#ifdef NEED_RUN_IN_TREE
134 if (getenv("ELM_RUN_IN_TREE")) 135 if (getenv("ELM_RUN_IN_TREE"))
135 { 136 {
136 snprintf(buf, sizeof(buf), 137 snprintf(buf, sizeof(buf),
137 ELM_TOP_BUILD_DIR "/src/modules/%s/.libs/module"EFL_SHARED_EXTENSION, m->name); 138 ELM_TOP_BUILD_DIR "/src/modules/%s/.libs/module"EFL_SHARED_EXTENSION, m->name);
138 } 139 }
139 else 140 else
141#endif
140 { 142 {
141 snprintf(buf, sizeof(buf), "%s/elementary/modules/%s/%s/module"EFL_SHARED_EXTENSION, 143 snprintf(buf, sizeof(buf), "%s/elementary/modules/%s/%s/module"EFL_SHARED_EXTENSION,
142 _elm_lib_dir, m->name, MODULE_ARCH); 144 _elm_lib_dir, m->name, MODULE_ARCH);
diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c
index 3e644df292..c3dda02310 100644
--- a/src/lib/elementary/elm_web2.c
+++ b/src/lib/elementary/elm_web2.c
@@ -173,11 +173,13 @@ _elm_web_init(const char *engine)
173{ 173{
174 char buf[PATH_MAX]; 174 char buf[PATH_MAX];
175 175
176#ifdef NEED_RUN_IN_TREE
176 if (getenv("ELM_RUN_IN_TREE")) 177 if (getenv("ELM_RUN_IN_TREE"))
177 snprintf(buf, sizeof(buf), 178 snprintf(buf, sizeof(buf),
178 ELM_TOP_BUILD_DIR"/src/modules/web/%s/.libs/module"EFL_SHARED_EXTENSION, 179 ELM_TOP_BUILD_DIR"/src/modules/web/%s/.libs/module"EFL_SHARED_EXTENSION,
179 engine); 180 engine);
180 else 181 else
182#endif
181 snprintf(buf, sizeof(buf), 183 snprintf(buf, sizeof(buf),
182 "%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION, 184 "%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
183 _elm_lib_dir, engine, MODULE_ARCH); 185 _elm_lib_dir, engine, MODULE_ARCH);
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index 719b5d3e85..5b9666f07a 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -62,6 +62,7 @@ _emotion_modules_load(void)
62 if (_emotion_modules_loaded) return; 62 if (_emotion_modules_loaded) return;
63 _emotion_modules_loaded = EINA_TRUE; 63 _emotion_modules_loaded = EINA_TRUE;
64 64
65#ifdef NEED_RUN_IN_TREE
65#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 66#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
66 if (getuid() == geteuid()) 67 if (getuid() == geteuid())
67#endif 68#endif
@@ -101,6 +102,7 @@ _emotion_modules_load(void)
101 } 102 }
102 } 103 }
103 } 104 }
105#endif
104 106
105 snprintf(buf, sizeof(buf), "%s/emotion/modules", eina_prefix_lib_get(_emotion_pfx)); 107 snprintf(buf, sizeof(buf), "%s/emotion/modules", eina_prefix_lib_get(_emotion_pfx));
106 _emotion_modules = eina_module_arch_list_get(_emotion_modules, buf, MODULE_ARCH); 108 _emotion_modules = eina_module_arch_list_get(_emotion_modules, buf, MODULE_ARCH);
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index 73ec5b9e0c..7737b01fb9 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -154,6 +154,7 @@ _ethumb_plugins_load(void)
154 if (_plugins_loaded) return; 154 if (_plugins_loaded) return;
155 _plugins_loaded = EINA_TRUE; 155 _plugins_loaded = EINA_TRUE;
156 156
157#ifdef NEED_RUN_IN_TREE
157#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 158#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
158 if (getuid() == geteuid()) 159 if (getuid() == geteuid())
159#endif 160#endif
@@ -182,6 +183,7 @@ _ethumb_plugins_load(void)
182 } 183 }
183 } 184 }
184 } 185 }
186#endif
185 187
186 snprintf(buf, sizeof(buf), "%s/ethumb/modules", eina_prefix_lib_get(_pfx)); 188 snprintf(buf, sizeof(buf), "%s/ethumb/modules", eina_prefix_lib_get(_pfx));
187 _plugins = eina_module_arch_list_get(_plugins, buf, MODULE_ARCH); 189 _plugins = eina_module_arch_list_get(_plugins, buf, MODULE_ARCH);
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index 67f565657f..f05870ad2b 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -110,6 +110,7 @@ evas_module_paths_init(void)
110{ 110{
111 char *libdir, *path; 111 char *libdir, *path;
112 112
113#ifdef NEED_RUN_IN_TREE
113#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 114#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
114 if (getuid() == geteuid()) 115 if (getuid() == geteuid())
115#endif 116#endif
@@ -125,6 +126,7 @@ evas_module_paths_init(void)
125 } 126 }
126 } 127 }
127 } 128 }
129#endif
128 130
129 /* 1. libevas.so/../evas/modules/ */ 131 /* 1. libevas.so/../evas/modules/ */
130 libdir = (char *)_evas_module_libdir_get(); 132 libdir = (char *)_evas_module_libdir_get();
@@ -408,9 +410,11 @@ evas_module_engine_list(void)
408 unsigned int i; 410 unsigned int i;
409 const char *s, *s2; 411 const char *s, *s2;
410 char buf[PATH_MAX]; 412 char buf[PATH_MAX];
413#ifdef NEED_RUN_IN_TREE
411 Eina_Bool run_in_tree; 414 Eina_Bool run_in_tree;
412 415
413 run_in_tree = !!getenv("EFL_RUN_IN_TREE"); 416 run_in_tree = !!getenv("EFL_RUN_IN_TREE");
417#endif
414 418
415 EINA_LIST_FOREACH(evas_module_paths, l, s) 419 EINA_LIST_FOREACH(evas_module_paths, l, s)
416 { 420 {
@@ -424,6 +428,7 @@ evas_module_engine_list(void)
424 { 428 {
425 const char *fname = fi->path + fi->name_start; 429 const char *fname = fi->path + fi->name_start;
426 430
431#ifdef NEED_RUN_IN_TREE
427 buf[0] = '\0'; 432 buf[0] = '\0';
428#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 433#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
429 if (getuid() == geteuid()) 434 if (getuid() == geteuid())
@@ -439,6 +444,7 @@ evas_module_engine_list(void)
439 } 444 }
440 445
441 if (buf[0] == '\0') 446 if (buf[0] == '\0')
447#endif
442 snprintf(buf, sizeof(buf), "%s/engines/%s/%s", 448 snprintf(buf, sizeof(buf), "%s/engines/%s/%s",
443 s, fname, MODULE_ARCH); 449 s, fname, MODULE_ARCH);
444 450
@@ -513,7 +519,9 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
513 Evas_Module *em; 519 Evas_Module *em;
514 Eina_Module *en; 520 Eina_Module *en;
515 Eina_List *l; 521 Eina_List *l;
522#ifdef NEED_RUN_IN_TREE
516 Eina_Bool run_in_tree; 523 Eina_Bool run_in_tree;
524#endif
517 525
518 if ((unsigned int)type > 5) return NULL; 526 if ((unsigned int)type > 5) return NULL;
519 527
@@ -524,7 +532,9 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
524 return NULL; 532 return NULL;
525 } 533 }
526 534
535#ifdef NEED_RUN_IN_TREE
527 run_in_tree = !!getenv("EFL_RUN_IN_TREE"); 536 run_in_tree = !!getenv("EFL_RUN_IN_TREE");
537#endif
528 538
529 EINA_LIST_FOREACH(evas_module_paths, l, path) 539 EINA_LIST_FOREACH(evas_module_paths, l, path)
530 { 540 {
@@ -540,6 +550,7 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
540 } 550 }
541 551
542 buffer[0] = '\0'; 552 buffer[0] = '\0';
553#if NEED_RUN_IN_TREE
543#if defined(HAVE_GETUID) && defined(HAVE_GETEUID) 554#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
544 if (getuid() == geteuid()) 555 if (getuid() == geteuid())
545#endif 556#endif
@@ -552,6 +563,7 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
552 buffer[0] = '\0'; 563 buffer[0] = '\0';
553 } 564 }
554 } 565 }
566#endif
555 567
556 if (buffer[0] == '\0') 568 if (buffer[0] == '\0')
557 snprintf(buffer, sizeof(buffer), "%s/%s/%s/%s/%s", 569 snprintf(buffer, sizeof(buffer), "%s/%s/%s/%s/%s",
diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c
index 0dbde6daa4..76656c4de7 100644
--- a/src/tests/ecore/ecore_suite.c
+++ b/src/tests/ecore/ecore_suite.c
@@ -40,7 +40,9 @@ main(int argc, char **argv)
40 if (!_efl_test_option_disp(argc, argv, etc)) 40 if (!_efl_test_option_disp(argc, argv, etc))
41 return 0; 41 return 0;
42 42
43#ifdef NEED_RUN_IN_TREE
43 putenv("EFL_RUN_IN_TREE=1"); 44 putenv("EFL_RUN_IN_TREE=1");
45#endif
44 46
45 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 47 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
46 "Ecore", etc); 48 "Ecore", etc);
diff --git a/src/tests/ecore_con/ecore_con_suite.c b/src/tests/ecore_con/ecore_con_suite.c
index 21585ae93e..1ef8b84d50 100644
--- a/src/tests/ecore_con/ecore_con_suite.c
+++ b/src/tests/ecore_con/ecore_con_suite.c
@@ -21,7 +21,9 @@ main(int argc, char **argv)
21 if (!_efl_test_option_disp(argc, argv, etc)) 21 if (!_efl_test_option_disp(argc, argv, etc))
22 return 0; 22 return 0;
23 23
24#ifdef NEED_RUN_IN_TREE
24 putenv("EFL_RUN_IN_TREE=1"); 25 putenv("EFL_RUN_IN_TREE=1");
26#endif
25 27
26 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 28 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
27 "Ecore_Con", etc); 29 "Ecore_Con", etc);
diff --git a/src/tests/ector/suite/ector_suite.c b/src/tests/ector/suite/ector_suite.c
index fa491df6ec..9f04a644b9 100644
--- a/src/tests/ector/suite/ector_suite.c
+++ b/src/tests/ector/suite/ector_suite.c
@@ -36,7 +36,9 @@ main(int argc, char *argv[])
36 if (!_efl_test_option_disp(argc, argv, etc)) 36 if (!_efl_test_option_disp(argc, argv, etc))
37 return 0; 37 return 0;
38 38
39#ifdef NEED_RUN_IN_TREE
39 putenv("EFL_RUN_IN_TREE=1"); 40 putenv("EFL_RUN_IN_TREE=1");
41#endif
40 42
41 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 43 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
42 "Ector", etc); 44 "Ector", etc);
diff --git a/src/tests/edje/edje_suite.c b/src/tests/edje/edje_suite.c
index 416a0ec3f8..0ec7d5c95a 100644
--- a/src/tests/edje/edje_suite.c
+++ b/src/tests/edje/edje_suite.c
@@ -18,7 +18,9 @@ main(int argc, char **argv)
18 if (!_efl_test_option_disp(argc, argv, etc)) 18 if (!_efl_test_option_disp(argc, argv, etc))
19 return 0; 19 return 0;
20 20
21#ifdef NEED_RUN_IN_TREE
21 putenv("EFL_RUN_IN_TREE=1"); 22 putenv("EFL_RUN_IN_TREE=1");
23#endif
22 24
23 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 25 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
24 "Edje", etc); 26 "Edje", etc);
diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c
index 3d8bb2d31c..a1d7840327 100644
--- a/src/tests/eet/eet_suite.c
+++ b/src/tests/eet/eet_suite.c
@@ -33,7 +33,9 @@ main(int argc, char *argv[])
33 if (!_efl_test_option_disp(argc, argv, etc)) 33 if (!_efl_test_option_disp(argc, argv, etc))
34 return 0; 34 return 0;
35 35
36#ifdef NEED_RUN_IN_TREE
36 putenv("EFL_RUN_IN_TREE=1"); 37 putenv("EFL_RUN_IN_TREE=1");
38#endif
37 39
38 memcpy(argv0, argv[0], strlen(argv[0]) + 1); 40 memcpy(argv0, argv[0], strlen(argv[0]) + 1);
39 41
diff --git a/src/tests/eeze/eeze_suite.c b/src/tests/eeze/eeze_suite.c
index 8f8d3659a8..d96ab9138d 100644
--- a/src/tests/eeze/eeze_suite.c
+++ b/src/tests/eeze/eeze_suite.c
@@ -21,7 +21,9 @@ main(int argc, char *argv[])
21 if (!_efl_test_option_disp(argc, argv, etc)) 21 if (!_efl_test_option_disp(argc, argv, etc))
22 return 0; 22 return 0;
23 23
24#ifdef NEED_RUN_IN_TREE
24 putenv("EFL_RUN_IN_TREE=1"); 25 putenv("EFL_RUN_IN_TREE=1");
26#endif
25 27
26 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 28 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
27 "Eeze", etc); 29 "Eeze", etc);
diff --git a/src/tests/efreet/efreet_suite.c b/src/tests/efreet/efreet_suite.c
index 732e1010a1..463215354e 100644
--- a/src/tests/efreet/efreet_suite.c
+++ b/src/tests/efreet/efreet_suite.c
@@ -19,7 +19,9 @@ main(int argc, char **argv)
19 if (!_efl_test_option_disp(argc, argv, etc)) 19 if (!_efl_test_option_disp(argc, argv, etc))
20 return 0; 20 return 0;
21 21
22#ifdef NEED_RUN_IN_TREE
22 putenv("EFL_RUN_IN_TREE=1"); 23 putenv("EFL_RUN_IN_TREE=1");
24#endif
23 25
24 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 26 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
25 "Efreet", etc); 27 "Efreet", etc);
diff --git a/src/tests/eina/eina_suite.c b/src/tests/eina/eina_suite.c
index e7e1b623d9..8e833356f3 100644
--- a/src/tests/eina/eina_suite.c
+++ b/src/tests/eina/eina_suite.c
@@ -129,7 +129,9 @@ main(int argc, char **argv)
129 if (!_efl_test_option_disp(argc, argv, etc)) 129 if (!_efl_test_option_disp(argc, argv, etc))
130 return 0; 130 return 0;
131 131
132#ifdef NEED_RUN_IN_TREE
132 putenv("EFL_RUN_IN_TREE=1"); 133 putenv("EFL_RUN_IN_TREE=1");
134#endif
133 135
134 _mempool_init(); 136 _mempool_init();
135 137
diff --git a/src/tests/eio/eio_suite.c b/src/tests/eio/eio_suite.c
index e08cc8fd89..b5b63d1ff2 100644
--- a/src/tests/eio/eio_suite.c
+++ b/src/tests/eio/eio_suite.c
@@ -31,7 +31,9 @@ main(int argc, char **argv)
31 if (!_efl_test_option_disp(argc, argv, etc)) 31 if (!_efl_test_option_disp(argc, argv, etc))
32 return 0; 32 return 0;
33 33
34#ifdef NEED_RUN_IN_TREE
34 putenv("EFL_RUN_IN_TREE=1"); 35 putenv("EFL_RUN_IN_TREE=1");
36#endif
35 37
36 eina_init(); 38 eina_init();
37 39
diff --git a/src/tests/eldbus/eldbus_suite.c b/src/tests/eldbus/eldbus_suite.c
index 4f3c6bb37a..a1240785e0 100644
--- a/src/tests/eldbus/eldbus_suite.c
+++ b/src/tests/eldbus/eldbus_suite.c
@@ -26,7 +26,9 @@ main(int argc, char **argv)
26 if (!_efl_test_option_disp(argc, argv, etc)) 26 if (!_efl_test_option_disp(argc, argv, etc))
27 return 0; 27 return 0;
28 28
29#ifdef NEED_RUN_IN_TREE
29 putenv("EFL_RUN_IN_TREE=1"); 30 putenv("EFL_RUN_IN_TREE=1");
31#endif
30 32
31 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 33 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
32 "Eldbus", etc); 34 "Eldbus", etc);
diff --git a/src/tests/elementary/elm_suite.c b/src/tests/elementary/elm_suite.c
index ed06e0aead..dee4d09351 100644
--- a/src/tests/elementary/elm_suite.c
+++ b/src/tests/elementary/elm_suite.c
@@ -94,8 +94,10 @@ main(int argc, char **argv)
94 if (!_efl_test_option_disp(argc, argv, etc)) 94 if (!_efl_test_option_disp(argc, argv, etc))
95 return 0; 95 return 0;
96 96
97#ifdef NEED_RUN_IN_TREE
97 putenv("EFL_RUN_IN_TREE=1"); 98 putenv("EFL_RUN_IN_TREE=1");
98 putenv("ELM_RUN_IN_TREE=1"); 99 putenv("ELM_RUN_IN_TREE=1");
100#endif
99 101
100 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 102 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
101 "Elementary", etc); 103 "Elementary", etc);
diff --git a/src/tests/elocation/elocation_suite.c b/src/tests/elocation/elocation_suite.c
index 6b2cc46809..c9ff759e82 100644
--- a/src/tests/elocation/elocation_suite.c
+++ b/src/tests/elocation/elocation_suite.c
@@ -220,7 +220,9 @@ main(void)
220 SRunner *sr; 220 SRunner *sr;
221 int failed_count; 221 int failed_count;
222 222
223#ifdef NEED_RUN_IN_TREE
223 putenv("EFL_RUN_IN_TREE=1"); 224 putenv("EFL_RUN_IN_TREE=1");
225#endif
224 226
225 s = elocation_suite(); 227 s = elocation_suite();
226 sr = srunner_create(s); 228 sr = srunner_create(s);
diff --git a/src/tests/elput/elput_suite.c b/src/tests/elput/elput_suite.c
index b56b84e714..35132162aa 100644
--- a/src/tests/elput/elput_suite.c
+++ b/src/tests/elput/elput_suite.c
@@ -20,7 +20,9 @@ main(int argc, char **argv)
20 20
21 if (!_efl_test_option_disp(argc, argv, etc)) return 0; 21 if (!_efl_test_option_disp(argc, argv, etc)) return 0;
22 22
23#ifdef NEED_RUN_IN_TREE
23 putenv("EFL_RUN_IN_TREE=1"); 24 putenv("EFL_RUN_IN_TREE=1");
25#endif
24 26
25 count = 27 count =
26 _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, "Elput", etc); 28 _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, "Elput", etc);
diff --git a/src/tests/elua/elua_suite.c b/src/tests/elua/elua_suite.c
index 1bf0ec81c3..1ad5ac164b 100644
--- a/src/tests/elua/elua_suite.c
+++ b/src/tests/elua/elua_suite.c
@@ -20,7 +20,9 @@ main(int argc, char **argv)
20 if (!_efl_test_option_disp(argc, argv, etc)) 20 if (!_efl_test_option_disp(argc, argv, etc))
21 return 0; 21 return 0;
22 22
23#ifdef NEED_RUN_IN_TREE
23 putenv("EFL_RUN_IN_TREE=1"); 24 putenv("EFL_RUN_IN_TREE=1");
25#endif
24 26
25 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 27 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
26 "Elua", etc); 28 "Elua", etc);
diff --git a/src/tests/emile/emile_suite.c b/src/tests/emile/emile_suite.c
index 2c968cfc34..7fc70631e5 100644
--- a/src/tests/emile/emile_suite.c
+++ b/src/tests/emile/emile_suite.c
@@ -19,7 +19,9 @@ main(int argc, char *argv[])
19 if (!_efl_test_option_disp(argc, argv, etc)) 19 if (!_efl_test_option_disp(argc, argv, etc))
20 return 0; 20 return 0;
21 21
22#ifdef NEED_RUN_IN_TREE
22 putenv("EFL_RUN_IN_TREE=1"); 23 putenv("EFL_RUN_IN_TREE=1");
24#endif
23 25
24 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 26 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
25 "Emile", etc); 27 "Emile", etc);
diff --git a/src/tests/eo/suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c
index 15cf8bc1ec..a9e6cc7444 100644
--- a/src/tests/eo/suite/eo_suite.c
+++ b/src/tests/eo/suite/eo_suite.c
@@ -25,7 +25,9 @@ main(int argc, char **argv)
25 if (!_efl_test_option_disp(argc, argv, etc)) 25 if (!_efl_test_option_disp(argc, argv, etc))
26 return 0; 26 return 0;
27 27
28#ifdef NEED_RUN_IN_TREE
28 putenv("EFL_RUN_IN_TREE=1"); 29 putenv("EFL_RUN_IN_TREE=1");
30#endif
29 31
30 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 32 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
31 "Eo", etc); 33 "Eo", etc);
diff --git a/src/tests/eolian/eolian_suite.c b/src/tests/eolian/eolian_suite.c
index c640a57e7f..1704b7f81b 100644
--- a/src/tests/eolian/eolian_suite.c
+++ b/src/tests/eolian/eolian_suite.c
@@ -25,7 +25,9 @@ main(int argc, char **argv)
25 if (!_efl_test_option_disp(argc, argv, etc)) 25 if (!_efl_test_option_disp(argc, argv, etc))
26 return 0; 26 return 0;
27 27
28#ifdef NEED_RUN_IN_TREE
28 putenv("EFL_RUN_IN_TREE=1"); 29 putenv("EFL_RUN_IN_TREE=1");
30#endif
29 31
30 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 32 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
31 "Eolian", etc); 33 "Eolian", etc);
diff --git a/src/tests/evas/evas_suite.c b/src/tests/evas/evas_suite.c
index 3021f2c582..45418c9775 100644
--- a/src/tests/evas/evas_suite.c
+++ b/src/tests/evas/evas_suite.c
@@ -32,7 +32,9 @@ main(int argc, char **argv)
32 if (!_efl_test_option_disp(argc, argv, etc)) 32 if (!_efl_test_option_disp(argc, argv, etc))
33 return 0; 33 return 0;
34 34
35#ifdef NEED_RUN_IN_TREE
35 putenv("EFL_RUN_IN_TREE=1"); 36 putenv("EFL_RUN_IN_TREE=1");
37#endif
36 38
37 evas_init(); 39 evas_init();
38 40
diff --git a/src/tests/evil/evil_suite.c b/src/tests/evil/evil_suite.c
index bc8bd79025..aeae25ebe0 100644
--- a/src/tests/evil/evil_suite.c
+++ b/src/tests/evil/evil_suite.c
@@ -54,7 +54,9 @@ main(int argc, char **argv)
54 if (!_efl_test_option_disp(argc, argv, etc)) 54 if (!_efl_test_option_disp(argc, argv, etc))
55 return 0; 55 return 0;
56 56
57#ifdef NEED_RUN_IN_TREE
57 putenv("EFL_RUN_IN_TREE=1"); 58 putenv("EFL_RUN_IN_TREE=1");
59#endif
58 60
59 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 61 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
60 "Evil", etc); 62 "Evil", etc);