From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 4 Feb 2015 19:45:23 +0000 (+0000)
Subject: Add test-fdpass to the build, and make it compile again
X-Git-Tag: dbus-1.9.10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239fa2081293ed26455e98b73a6c484730b00372;p=thirdparty%2Fdbus.git

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

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88998
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
---

diff --git a/test/Makefile.am b/test/Makefile.am
index e4bbdf0e1..c2a55c9ed 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 \
@@ -272,6 +273,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 d7929a8f0..fa958da88 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