Attachment 58163 Details for Bug 46358 – [01/10] Expect to find service files in the srcdir, not the builddir

[patch] [01/10] Expect to find service files in the srcdir, not the builddir

0001-Expect-to-find-service-files-in-the-srcdir-not-the-b.patch (text/plain), 1.79 KB, created by Simon McVittie on 2012-03-08 03:20:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-08 03:20:29 UTC

Size: 1.79 KB

patch

obsolete

>From 485f776f819b88cd9dc56f22d58361a13eace1b3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>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 <simon.mcvittie@collabora.co.uk>
>---
> 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 @@
> 
>   <listen>unix:tmpdir=/tmp</listen>
> 
>-  <servicedir>@abs_top_builddir@/tests/dbus/dbus-installed/services/</servicedir>
>+  <servicedir>@abs_top_srcdir@/tests/dbus/dbus-uninstalled/services</servicedir>
> 
>   <policy context="default">
>     
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 46358: 58163 | 58164 | 58165 | 58166 | 58167 | 58168 | 58169 | 58170 | 58171 | 58172

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.