From 6873b17117a41715c9a8ca63060974b64b4cdcf4 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 21 Feb 2016 23:17:59 +0200
Subject: Support for Chibios compilation

Remove some warnings, change the include paths.
---
 serial_link/tests/Makefile                       | 2 +-
 serial_link/tests/byte_stuffer_tests.c           | 8 ++++----
 serial_link/tests/frame_router_tests.c           | 8 ++++----
 serial_link/tests/frame_validator_tests.c        | 2 +-
 serial_link/tests/transport_tests.c              | 4 ++--
 serial_link/tests/triple_buffered_object_tests.c | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'serial_link/tests')

diff --git a/serial_link/tests/Makefile b/serial_link/tests/Makefile
index 0d8ba4b7b6..1b072c6f1d 100644
--- a/serial_link/tests/Makefile
+++ b/serial_link/tests/Makefile
@@ -22,7 +22,7 @@
 
 CC = gcc
 CFLAGS	= 
-INCLUDES = -I. -I../
+INCLUDES = -I. -I../../
 LDFLAGS = -L$(BUILDDIR)/cgreen/build-c/src -shared
 LDLIBS = -lcgreen
 UNITOBJ = $(BUILDDIR)/serialtest/unitobj
diff --git a/serial_link/tests/byte_stuffer_tests.c b/serial_link/tests/byte_stuffer_tests.c
index 912c4d3211..64b170e8c1 100644
--- a/serial_link/tests/byte_stuffer_tests.c
+++ b/serial_link/tests/byte_stuffer_tests.c
@@ -24,10 +24,10 @@ SOFTWARE.
 
 #include <cgreen/cgreen.h>
 #include <cgreen/mocks.h>
-#include "protocol/byte_stuffer.h"
-#include "protocol/byte_stuffer.c"
-#include "protocol/frame_validator.h"
-#include "protocol/physical.h"
+#include "serial_link/protocol/byte_stuffer.h"
+#include "serial_link/protocol/byte_stuffer.c"
+#include "serial_link/protocol/frame_validator.h"
+#include "serial_link/protocol/physical.h"
 
 static uint8_t sent_data[MAX_FRAME_SIZE*2];
 static uint16_t sent_data_size;
diff --git a/serial_link/tests/frame_router_tests.c b/serial_link/tests/frame_router_tests.c
index 0b0ea6e7f4..6c806fa939 100644
--- a/serial_link/tests/frame_router_tests.c
+++ b/serial_link/tests/frame_router_tests.c
@@ -24,10 +24,10 @@ SOFTWARE.
 
 #include <cgreen/cgreen.h>
 #include <cgreen/mocks.h>
-#include "protocol/byte_stuffer.c"
-#include "protocol/frame_validator.c"
-#include "protocol/frame_router.c"
-#include "protocol/transport.h"
+#include "serial_link/protocol/byte_stuffer.c"
+#include "serial_link/protocol/frame_validator.c"
+#include "serial_link/protocol/frame_router.c"
+#include "serial_link/protocol/transport.h"
 
 static uint8_t received_data[256];
 static uint16_t received_data_size;
diff --git a/serial_link/tests/frame_validator_tests.c b/serial_link/tests/frame_validator_tests.c
index f4abd14d1b..d20947e2c9 100644
--- a/serial_link/tests/frame_validator_tests.c
+++ b/serial_link/tests/frame_validator_tests.c
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include <cgreen/cgreen.h>
 #include <cgreen/mocks.h>
-#include "protocol/frame_validator.c"
+#include "serial_link/protocol/frame_validator.c"
 
 void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) {
     mock(data, size);
diff --git a/serial_link/tests/transport_tests.c b/serial_link/tests/transport_tests.c
index 3fa8eab4ac..3e9bffdfa7 100644
--- a/serial_link/tests/transport_tests.c
+++ b/serial_link/tests/transport_tests.c
@@ -24,8 +24,8 @@ SOFTWARE.
 
 #include <cgreen/cgreen.h>
 #include <cgreen/mocks.h>
-#include "protocol/transport.c"
-#include "protocol/triple_buffered_object.c"
+#include "serial_link/protocol/transport.c"
+#include "serial_link/protocol/triple_buffered_object.c"
 
 void signal_data_written(void) {
     mock();
diff --git a/serial_link/tests/triple_buffered_object_tests.c b/serial_link/tests/triple_buffered_object_tests.c
index 1017df8f5e..6f7c82b468 100644
--- a/serial_link/tests/triple_buffered_object_tests.c
+++ b/serial_link/tests/triple_buffered_object_tests.c
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include <cgreen/cgreen.h>
-#include "protocol/triple_buffered_object.c"
+#include "serial_link/protocol/triple_buffered_object.c"
 
 typedef struct {
     uint8_t state;
-- 
cgit v1.2.3