summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2016-02-18 13:43:07 +0000
committerTim-Philipp Müller <tim@centricular.com>2016-02-18 13:46:45 +0000
commit8e2c1d1de56bddbff22170f8b17473882e0e63f9 (patch)
treea727f7461a68a4f9d06745eea07bc296c5a48aeb /tests
parenta7c3f353bdbbdfa5baa091677de22172e5230e83 (diff)
tests: fix spurious souphttpsrc test timouts
Set GSETTINGS_BACKEND=memory, apparently there's something about fork() and the dconf backend (or whatever else that drags in or activates) that messes up locking and causes timeouts due to deadlocks in g_mutex_lock(), since everything works fine with CK_FORK=no as well.
Diffstat (limited to 'tests')
-rw-r--r--tests/check/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 2da3aaf8b..bc78f9fc5 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -15,7 +15,8 @@ AM_TESTS_ENVIRONMENT += \
cacasink cairotextoverlay \
halaudiosrc halaudiosink jackaudiosrc jackaudiosink \
osssrc osssink osxaudiosink osxaudiosrc osxvideosrc osxvideosink \
- pulsesink pulsesrc pulsemixer v4l2src"
+ pulsesink pulsesrc pulsemixer v4l2src" \
+ GSETTINGS_BACKEND="memory"
# fake device drivers: we could run hardware element tests against dummy drivers
# v4l2: vivo (part of normal kernel)