summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-02-04 19:45:23 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-02-05 15:23:22 +0000
commit239fa2081293ed26455e98b73a6c484730b00372 (patch)
tree1f604d7bf6d2adf87b5a59a3f32a84b3fd9d57c1
parent4f99a694b5f766643d9eb2f6fca9c6c107844d4a (diff)
downloaddbus-239fa2081293ed26455e98b73a6c484730b00372.tar.gz
dbus-239fa2081293ed26455e98b73a6c484730b00372.tar.bz2
dbus-239fa2081293ed26455e98b73a6c484730b00372.zip
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>
-rw-r--r--test/Makefile.am12
-rw-r--r--test/fdpass.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index e4bbdf0e..c2a55c9e 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 d7929a8f..fa958da8 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