Commit 134c64b5 authored by Jeremy Whiting's avatar Jeremy Whiting
Browse files

Remove gconf soft dependency used for eds unit tests.

Fixes: bgo 674611
parent 0b36298e
......@@ -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
......
......@@ -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 \
......
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
# 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
......@@ -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) \
......
......@@ -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 \
......
......@@ -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= \
......
......@@ -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
......
......@@ -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 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment