mirror of
https://github.com/obgm/libcoap.git
synced 2026-11-21 14:59:06 +03:00
resolved conflict after cherry-picking from branch relative-timestamps
This commit is contained in:
1 parent
a4358bd2ce
commit
652bdd5f63
2 files changed
+4
-2
No files matched your search
+2
-2
@@ -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
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user