Attachment 113198 Details for Bug 88998 – Add test-fdpass to the build, and make it compile again

[patch] Add test-fdpass to the build, and make it compile again

0001-Add-test-fdpass-to-the-build-and-make-it-compile-aga.patch (text/plain), 1.36 KB, created by Simon McVittie on 2015-02-05 14:16:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-02-05 14:16:46 UTC

Size: 1.36 KB

patch

obsolete

>From 613017f81b26d194a60afd0b1a2d1cbdbdb7801a Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 4 Feb 2015 19:45:23 +0000
>Subject: [PATCH] Add test-fdpass to the build, and make it compile again
>
>---
> test/Makefile.am | 12 ++++++++++++
> test/fdpass.c    |  2 +-
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index ca2fb9d..5b39333 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -156,6 +156,7 @@ installable_tests += \
> 	test-corrupt \
> 	test-dbus-daemon \
> 	test-dbus-daemon-eavesdrop \
>+	test-fdpass \
> 	test-monitor \
> 	test-loopback \
> 	test-marshal \
>@@ -270,6 +271,17 @@ test_uid_permissions_LDADD = \
>     $(GLIB_LIBS) \
>     $(NULL)
> 
>+test_fdpass_SOURCES = \
>+    fdpass.c \
>+    $(NULL)
>+test_fdpass_CPPFLAGS = \
>+    $(static_cppflags) \
>+    $(NULL)
>+test_fdpass_LDADD = \
>+    libdbus-testutils-internal.la \
>+    $(GLIB_LIBS) \
>+    $(NULL)
>+
> if DBUS_ENABLE_MODULAR_TESTS
> TESTS += $(installable_tests)
> installcheck_tests += $(installable_tests)
>diff --git a/test/fdpass.c b/test/fdpass.c
>index d7929a8..fa958da 100644
>--- a/test/fdpass.c
>+++ b/test/fdpass.c
>@@ -47,7 +47,7 @@
> # include <unistd.h>
> #endif
> 
>-#include "test-utils.h"
>+#include "test-utils-glib.h"
> 
> /* Arbitrary; included here to avoid relying on the default */
> #define MAX_MESSAGE_UNIX_FDS 20
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 88998: 113198 | 113326 | 113347

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.