From 7da05adee0a0cb3dbd231ef0cafdb733227a26c1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 23 Jan 2018 21:56:26 -0500 Subject: [PATCH] #463 fixing unit_tests --- unit_tests/Makefile | 9 ++++++--- unit_tests/main.cpp | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/unit_tests/Makefile b/unit_tests/Makefile index ff0a137a60..83c9d6e2a8 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -131,6 +131,8 @@ TCPPSRC = # List ASM source files here ASMSRC = $(PORTASM) +CHIBIOS=$(PROJECT_DIR)/ChibiOS3 + INCDIR = . \ $(PROJECT_DIR)/util \ $(PROJECT_DIR)/config/engines \ @@ -143,9 +145,10 @@ INCDIR = . \ $(PROJECT_DIR)/controllers/trigger \ $(PROJECT_DIR)/controllers/trigger/decoders \ $(PROJECT_DIR)/ext_algo \ - $(PROJECT_DIR)/ChibiOS3/os/rt/include \ - $(PROJECT_DIR)/ChibiOS3/os/hal/lib/streams \ - $(PROJECT_DIR)/ChibiOS3/os/rt/various \ + $(CHIBIOS)/os/rt/include \ + $(CHIBIOS)/os/rt/various \ + $(CHIBIOS)/os/hal/lib/streams \ + $(CHIBIOS)/os/hal/include \ $(PROJECT_DIR)/hw_layer \ test_data_structures \ test_basic_math diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index e3291b7d03..552121a379 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -36,10 +36,9 @@ typedef int32_t msg_t; -#include "chstreams.h" +#include "hal_streams.h" #include "memstreams.h" - static engine_configuration_s ec; engine_configuration_s *engineConfiguration = &ec;