Better handling of the TEST_INSTALLED_SERVICES variable

Don't set the encapsulated environment variables when running installed.

diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 9c83031..4564521 100644 (file)
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -687,10 +687,13 @@ e_test_server_utils_run_full (ETestServerFlags flags)
        gint tests_ret;
 
        /* Cleanup work directory */
-       if ((flags & E_TEST_SERVER_KEEP_WORK_DIRECTORY) == 0)
-               delete_work_directory ();
+       if (!test_installed_services()) {
 
-       setup_environment ();
+               if ((flags & E_TEST_SERVER_KEEP_WORK_DIRECTORY) == 0)
+                       delete_work_directory ();
+
+               setup_environment ();
+       }
 
 #if GLOBAL_DBUS_DAEMON
        if (!test_installed_services ()) {