From 652bdd5f63e5bc48f3f6f33de9576167c42d5192 Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Sun, 10 Nov 2013 11:52:19 +0100 Subject: [PATCH] resolved conflict after cherry-picking from branch relative-timestamps --- tests/Makefile.in | 4 ++-- tests/testdriver.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.in b/tests/Makefile.in index 74d635a7..95da5c00 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -21,14 +21,14 @@ ifneq (,@TESTS@) PROGRAMS:=testdriver endif SOURCES:= test_uri.c test_options.c test_pdu.c test_error_response.c \ - test_wellknown.c + test_sendqueue.c test_wellknown.c HEADERS:=$(SOURCES:.c=.h) OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) CFLAGS:=-g -Wall @CFLAGS@ CPPFLAGS:=-I$(top_srcdir) @CPPFLAGS@ DISTDIR?=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ FILES:=Makefile.in testdriver.c $(HEADERS) $(SOURCES) -LDFLAGS:=-L$(top_builddir) +LDFLAGS:=-L$(top_builddir) @LDFLAGS@ LDLIBS:=-lcunit @LIBS@ libcoap =$(top_builddir)/libcoap.a diff --git a/tests/testdriver.c b/tests/testdriver.c index c47b9347..9ebb010a 100644 --- a/tests/testdriver.c +++ b/tests/testdriver.c @@ -9,6 +9,7 @@ #include "test_options.h" #include "test_pdu.h" #include "test_error_response.h" +#include "test_sendqueue.h" #include "test_wellknown.h" @@ -26,6 +27,7 @@ main(int argc, char **argv) { t_init_option_tests(); t_init_pdu_tests(); t_init_error_response_tests(); + t_init_sendqueue_tests(); t_init_wellknown_tests(); CU_basic_set_mode(run_mode);