From 485f776f819b88cd9dc56f22d58361a13eace1b3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 5 Mar 2012 19:18:23 +0000 Subject: [PATCH 01/10] Expect to find service files in the srcdir, not the builddir This fixes the /cm/list test in out-of-tree builds, or rather, would fix it if that test had ever worked (which is fixed by the next commit). Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 Signed-off-by: Simon McVittie --- tests/dbus/Makefile.am | 5 ++++- tests/dbus/dbus-uninstalled/session.conf.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am index f613ce4..4857db7 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -330,7 +330,10 @@ run-test.sh: run-test.sh.in dbus-uninstalled/%.conf: $(srcdir)/dbus-uninstalled/%.conf.in $(AM_V_at)$(mkdir_p) dbus-uninstalled - $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ + $(AM_V_GEN)sed \ + -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \ + -e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \ + $< > $@ dbus-installed/%.conf: $(srcdir)/dbus-installed/%.conf.in $(AM_V_at)$(mkdir_p) dbus-installed diff --git a/tests/dbus/dbus-uninstalled/session.conf.in b/tests/dbus/dbus-uninstalled/session.conf.in index fcb7327..075ef74 100644 --- a/tests/dbus/dbus-uninstalled/session.conf.in +++ b/tests/dbus/dbus-uninstalled/session.conf.in @@ -12,7 +12,7 @@ unix:tmpdir=/tmp - @abs_top_builddir@/tests/dbus/dbus-installed/services/ + @abs_top_srcdir@/tests/dbus/dbus-uninstalled/services -- 1.7.9.1