summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-06-04 13:57:48 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-06-04 14:29:10 +0200
commit6a841c0cd1532f6e2e04c2fbb674ee3f69c714b7 (patch)
tree5d370ffd826b85cf2dc63546a6c22e5b331c1d3a /include
parentdf0676ab00673a76d814762d30b4fab708812b75 (diff)
downloadNetworkManager-6a841c0cd1532f6e2e04c2fbb674ee3f69c714b7.tar.gz
core: avoid loading GIO modules
Turns out the dconf modules is leaky and breaks the valgrind run. In any case, it's not a good idea to load the modules for the daemon, it just takes time and memory. On a Fedora/x86_64 desktop it adds up to 5M to the RSS.
Diffstat (limited to 'include')
-rw-r--r--include/nm-test-utils.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index d666366098..c14d6eca02 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -439,6 +439,11 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
/* ensure that monotonic timestamp is called (because it initially logs a line) */
nm_utils_get_monotonic_timestamp_s ();
#endif
+
+ /* Avoid loading the VFS modules we don't use in the daemon.
+ * See: src/main-utils.c:nm_main_utils_early_setup() */
+ setenv ("GIO_USE_VFS", "local", 1);
+ setenv ("GIO_MODULE_DIR", "", 1);
}
#ifdef __NETWORKMANAGER_LOGGING_H__