From 239fa2081293ed26455e98b73a6c484730b00372 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 4 Feb 2015 19:45:23 +0000 Subject: [PATCH] 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 --- 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 e4bbdf0..c2a55c9 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 d7929a8..fa958da 100644 --- a/test/fdpass.c +++ b/test/fdpass.c @@ -47,7 +47,7 @@ # include #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.7.4