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 e4bbdf0e1483fc6e5a03b97c03a11ad7924c5ee6..c2a55c9edfb4d975621a179a64640f221973aeee 100644 (file)
--- 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 d7929a8f06945a9b7e11abd50626d4c9eab8d656..fa958da88b79d9bb05104059d025075096c13183 100644 (file)
--- 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