stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c74e03fda48a5f44dfc3c43b2ad17f4fc9e90490

commit c74e03fda48a5f44dfc3c43b2ad17f4fc9e90490
Author: Stefan Schmidt <[email protected]>
Date:   Tue Nov 3 12:37:17 2015 +0100

    tests/ecore_con: check saved env variables before setting them again.
    
    We see segfaults on Jenkins with these two test cases. Better check
    before setting them as we had similar problems before on this setup
    as XDG_RUNTIME_DIR might never be set.
---
 src/tests/ecore_con/ecore_con_test_ecore_con.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con.c 
b/src/tests/ecore_con/ecore_con_test_ecore_con.c
index 249f39e..d7f03e6 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con.c
@@ -335,7 +335,7 @@ START_TEST(ecore_test_ecore_con_local_user_home)
 
    unsetenv("XDG_RUNTIME_DIR");
    _ecore_con_server_client_tests(ECORE_CON_LOCAL_USER, "test_soc", 
EINA_FALSE, 12345);
-   setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
+   if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
 }
 END_TEST
 
@@ -347,8 +347,8 @@ START_TEST(ecore_test_ecore_con_local_user_tmp)
    unsetenv("XDG_RUNTIME_DIR");
    unsetenv("HOME");
    _ecore_con_server_client_tests(ECORE_CON_LOCAL_USER, "test_sock", 
EINA_FALSE, 12345);
-   setenv("HOME", homedir, 1);
-   setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
+   if (homedir) setenv("HOME", homedir, 1);
+   if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
 }
 END_TEST
 

-- 


Reply via email to