Merge pull request #5 from ARMmbed/thread_changes

Thread changes

Author: Tero Heinonen

.gitignore

@@ -1,3 +1,10 @@
 *.a
 *.lib
 output
+lcov
+coverage
+.yotta.json
+build/
+yotta_modules/
+yotta_targets/
+

.yotta_ignore

@@ -0,0 +1,4 @@
+unittest/*
+test/*
+doxygen/*
+

CoAP_Server_unit_test/CoAP_Server_unit_test_app.c

@@ -20,37 +20,32 @@
 #
 SERVLIB_DIR := ../libService
 override CFLAGS += -I$(SERVLIB_DIR)/libService/
-#override CFLAGS += -I$(SERVLIB_DIR)/libService/platform/
+
+NANOSTACK_DIR := ../nanostack
+override CFLAGS += -I$(NANOSTACK_DIR)/nanostack/
 
 NSDLC_DIR := ../nsdl-c
 override CFLAGS += -I$(NSDLC_DIR)/nsdl-c
 
 EVENTLOOP_DIR := ../event-loop
 override CFLAGS += -I$(EVENTLOOP_DIR)/nanostack-event-loop/
-#override CFLAGS += -I$(EVENTLOOP_DIR)/event-loop/
-
-#override CFLAGS += -I../libService/libService/
-#override CFLAGS += -I../nsdl-c/nsdl-c/
-#override CFLAGS += -I../event-loop/nanostack-event-loop/
-
-LIB = libcoap-service.a
-
-SRCS := \
-	source/coap_service.c \
-	source/coap_server.c \
-	coap-service-nanomesh/coap_server_impl.c \
-
-override CFLAGS += -DVERSION='"$(VERSION)"'
-
 
+MBEDTLS_DIR := ../mbedtls
+override CFLAGS += -I$(MBEDTLS_DIR)/configs -I$(MBEDTLS_DIR) -DMBEDTLS_CONFIG_FILE='<config-thread.h>' -I$(MBEDTLS_DIR)/include
 
 COAPSERVICE_DIR := ../coap-service
 override CFLAGS += -I$(COAPSERVICE_DIR)/coap-service/
 override CFLAGS += -I$(COAPSERVICE_DIR)/source/include/
 
-#override CFLAGS += -Isource/coap-service/source/include/
-#override CFLAGS += -Icoap-service-nanomesh/include/
+LIB = libcoap-service.a
+
+SRCS := \
+	source/coap_connection_handler.c \
+	source/coap_message_handler.c \
+	source/coap_security_handler.c \
+	source/coap_service_api.c \
 
+override CFLAGS += -DVERSION='"$(VERSION)"'
 
 include ../libService/toolchain_rules.mk
 

Makefile

@@ -0,0 +1,51 @@
+#
+# Makefile.test for COAP service unit tests
+#
+
+# List of subdirectories to build
+TEST_FOLDER := ./test/
+# List of unit test directories for libraries
+UNITTESTS := $(sort $(dir $(wildcard $(TEST_FOLDER)*/unittest/*)))
+TESTDIRS := $(UNITTESTS:%=build-%)
+CLEANTESTDIRS := $(UNITTESTS:%=clean-%)
+COVERAGEFILE := ./lcov/coverage.info
+
+.PHONY: test
+test: $(TESTDIRS)
+	@rm -rf ./lcov
+	@rm -rf ./coverage
+	@mkdir -p lcov
+	@mkdir -p lcov/results
+	@mkdir coverage
+	@find ./test -name '*.xml' | xargs cp -t ./lcov/results/
+	@rm -f lcov/index.xml
+	@./xsl_script.sh
+	@cp junit_xsl.xslt lcov/.
+	@xsltproc -o lcov/testresults.html lcov/junit_xsl.xslt lcov/index.xml
+	@rm -f lcov/junit_xsl.xslt
+	@rm -f lcov/index.xml
+	@find ./ -name '*.gcno' | xargs cp --backup=numbered -t ./coverage/
+	@find ./ -name '*.gcda' | xargs cp --backup=numbered -t ./coverage/
+	@gcovr --object-directory ./coverage  --exclude-unreachable-branches -e '.*/builds/.*' -e '.*/test/.*' -e '.*/yotta_modules/.*' -e '.*/stub/.*' -x -o ./lcov/gcovr.xml
+	@lcov -d test/. -c -o $(COVERAGEFILE)
+	@lcov -q -r $(COVERAGEFILE) "/usr*" -o $(COVERAGEFILE)
+	@lcov -q -r $(COVERAGEFILE) "/test*" -o $(COVERAGEFILE)
+	@lcov -q -r $(COVERAGEFILE) "/mbed-client-libservice*" -o $(COVERAGEFILE)
+	@lcov -q -r $(COVERAGEFILE) "/libService*" -o $(COVERAGEFILE)
+	@genhtml -q $(COVERAGEFILE) --show-details --output-directory lcov/html
+	@echo coap-service unit tests built
+
+$(TESTDIRS):
+	@make -C $(@:build-%=%)
+
+$(CLEANDIRS):
+	@make -C $(@:clean-%=%) clean
+
+$(CLEANTESTDIRS):
+	@make -C $(@:clean-%=%) clean
+
+# Extend default clean rule
+clean: clean-extra
+
+clean-extra: $(CLEANDIRS) \
+	$(CLEANTESTDIRS)