From 134c64b5fcf576c3b989c8d468cad82e4b0813fd Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Tue, 10 Jul 2012 14:48:59 -0600 Subject: [PATCH] Remove gconf soft dependency used for eds unit tests. Fixes: bgo 674611 --- configure.ac | 6 ----- folks/Makefile.am | 1 - tests/data/Makefile.am | 19 ------------- tests/data/gconf.path.in | 54 ------------------------------------- tests/eds/Makefile.am | 1 - tests/folks/Makefile.am | 1 - tests/libsocialweb/Makefile.am | 1 - tests/tools/with-session-bus-eds.sh | 4 --- tests/tracker/Makefile.am | 1 - 9 files changed, 88 deletions(-) delete mode 100644 tests/data/gconf.path.in diff --git a/configure.ac b/configure.ac index fc98273..19c49d1 100644 --- a/configure.ac +++ b/configure.ac @@ -515,11 +515,6 @@ AM_CONDITIONAL([ENABLE_PROFILING], [test "$enable_profiling" = "yes"]) # Final output # ----------------------------------------------------------- -# FIXME: We can't remove gconf.path until bgo#635379 is fixed, since we need to -# safely contain EDS' use of GConf for the EDS backend tests. -# Note that our use of gconf.path doesn't actually need GConf to be installed, -# though, so it's not a hard dependency of folks. - AC_CONFIG_FILES([ backends/telepathy/lib/folks-telepathy.pc backends/telepathy/lib/folks-telepathy-uninstalled.pc @@ -549,7 +544,6 @@ AC_CONFIG_FILES([ po/Makefile.in tests/Makefile tests/data/Makefile - tests/data/gconf.path tests/eds/Makefile tests/folks/Makefile tests/key-file/Makefile diff --git a/folks/Makefile.am b/folks/Makefile.am index 534ad09..d24c7f5 100644 --- a/folks/Makefile.am +++ b/folks/Makefile.am @@ -109,7 +109,6 @@ libfolks_la_VALAFLAGS = \ --pkg gmodule-2.0 \ --pkg gio-2.0 \ --pkg gee-0.8 \ - --pkg gconf-2.0 \ --includedir folks \ --vapi folks.vapi \ -H folks.h \ diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 8a967a9..a2b9838 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -1,24 +1,5 @@ EXTRA_DIST = \ backend-store-all.ini \ - gconf.path \ - gconf.path.in \ $(NULL) -clean-gconf: - rm -rf gconf.d - -clean-local: clean-gconf - -check: clean-gconf - -DISTCLEANFILES = \ - gconf.path \ - $(NULL) - -GITIGNOREFILES = \ - gconf.d \ - $(NULL) - -.PHONY: clean-gconf clean-local - -include $(top_srcdir)/git.mk diff --git a/tests/data/gconf.path.in b/tests/data/gconf.path.in deleted file mode 100644 index 9262115..0000000 --- a/tests/data/gconf.path.in +++ /dev/null @@ -1,54 +0,0 @@ -# These settings set up gconf in a sandbox for our tests for a few reasons: -# -# 1. So we don't read or mangle the $USER's gconf settings -# -# 2. To have a consistent state every time we run the tests for -# repeatability -# -# Note that we still source the system settings to hopefully play nicely -# with unusual (yet valid) set-ups. We can't source /etc/gconf/2/path directly -# since it will pull in various config paths in $(HOME). -# -# This is based on the default /etc/gconf/2/path -########################################################################### - -###################### -# 1. Forced settings # -###################### - -# Settings forced by the local administrator -xml:readonly:/etc/gconf/gconf.xml.mandatory - -# Other forced sources imagined by the local administrator -include /etc/gconf/2/local-mandatory.path - -####################### -# 2. User Preferences # -####################### - -# our in-tree writeable directory for these tests -xml:readwrite:@abs_top_srcdir@/tests/data/gconf.d - -# mandatory path for desktop-profiles -include $(ENV_MANDATORY_PATH) - -# default path for desktop-profiles -include $(ENV_DEFAULTS_PATH) - -###################### -# 3. System defaults # -###################### - -# Other default sources imagined by the local administrator -include /etc/gconf/2/local-defaults.path - -# System administrator's defaults. This source also serves as a legacy -# source for packages not using a recent dh_gconf, or for applications -# installed by hand. -xml:readonly:/etc/gconf/gconf.xml.defaults - -# Upstream application defaults -# XXX: we would use @localstatedir@ here except we don't want "${prefix}" in the -# generated file in case GConf doesn't know how to evaluate that -xml:readonly:@prefix@/var/lib/gconf/defaults -xml:readonly:/var/lib/gconf/defaults diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am index 7e81ed5..03ee036 100644 --- a/tests/eds/Makefile.am +++ b/tests/eds/Makefile.am @@ -84,7 +84,6 @@ RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus-eds.sh backend_store_key_file=$(srcdir)/data/backend-eds-only.ini avatar_file=@abs_top_srcdir@/tests/data/avatar-01.jpg TESTS_ENVIRONMENT = \ - GCONF_DEFAULT_SOURCE_PATH=@abs_top_srcdir@/tests/data/gconf.path \ FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \ FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \ AVATAR_FILE_PATH=$(avatar_file) \ diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am index c40fff3..62bd9df 100644 --- a/tests/folks/Makefile.am +++ b/tests/folks/Makefile.am @@ -57,7 +57,6 @@ SESSION_CONF = $(top_builddir)/tests/lib/telepathy/contactlist/session.conf backend_store_key_file=$(top_srcdir)/tests/data/backend-store-all.ini avatar_file=@abs_top_srcdir@/tests/data/avatar-01.jpg TESTS_ENVIRONMENT = \ - GCONF_DEFAULT_SOURCE_PATH=@abs_top_srcdir@/tests/data/gconf.path \ FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \ FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \ FOLKS_PRIMARY_STORE=key-file \ diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am index 1186dbe..3af489e 100644 --- a/tests/libsocialweb/Makefile.am +++ b/tests/libsocialweb/Makefile.am @@ -52,7 +52,6 @@ noinst_PROGRAMS = \ SESSION_CONF = $(top_builddir)/tests/lib/libsocialweb/session.conf backend_store_key_file=$(srcdir)/data/backend-lsw-only.ini TESTS_ENVIRONMENT = \ - GCONF_DEFAULT_SOURCE_PATH=@abs_top_srcdir@/tests/data/gconf.path \ FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \ FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \ FOLKS_PRIMARY_STORE= \ diff --git a/tests/tools/with-session-bus-eds.sh b/tests/tools/with-session-bus-eds.sh index ed0244d..e3c1e5d 100755 --- a/tests/tools/with-session-bus-eds.sh +++ b/tests/tools/with-session-bus-eds.sh @@ -26,14 +26,10 @@ cleanup () { eds_stop dbus_stop - test -d ../data/gconf.d && rm -rf ../data/gconf.d } trap cleanup INT HUP TERM -# In case the previous run left some junk around... -test -d ../data/gconf.d && rm -rf ../data/gconf.d - eds_init_settings dbus_init 0 diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am index 5ebd1e0..fe88726 100644 --- a/tests/tracker/Makefile.am +++ b/tests/tracker/Makefile.am @@ -106,7 +106,6 @@ noinst_PROGRAMS = \ backend_store_key_file=$(srcdir)/data/backend-tracker-only.ini avatar_file=@abs_top_srcdir@/tests/data/avatar-01.jpg TESTS_ENVIRONMENT = \ - GCONF_DEFAULT_SOURCE_PATH=@abs_top_srcdir@/tests/data/gconf.path \ FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \ FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \ FOLKS_PRIMARY_STORE=tracker \ -- 2.7.4