rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup test code

This commit is contained in:
Martin Budden 2017-01-28 07:37:15 +00:00
parent 65e0d9990b
commit bfbacf8b44
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/Makefile
View File

@ -256,24 +256,24 @@ $(OBJECT_DIR)/altitude_hold_unittest : \
$(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
$(OBJECT_DIR)/flight/gps_conversion.o : \
$(USER_DIR)/flight/gps_conversion.c \
$(USER_DIR)/flight/gps_conversion.h \
$(OBJECT_DIR)/common/gps_conversion.o : \
$(USER_DIR)/common/gps_conversion.c \
$(USER_DIR)/common/gps_conversion.h \
$(GTEST_HEADERS)
@mkdir -p $(dir $@)
$(CC) $(C_FLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/flight/gps_conversion.c -o $@
$(CC) $(C_FLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/common/gps_conversion.c -o $@
$(OBJECT_DIR)/gps_conversion_unittest.o : \
$(TEST_DIR)/gps_conversion_unittest.cc \
$(USER_DIR)/flight/gps_conversion.h \
$(USER_DIR)/common/gps_conversion.h \
$(GTEST_HEADERS)
@mkdir -p $(dir $@)
$(CXX) $(CXX_FLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/gps_conversion_unittest.cc -o $@
$(OBJECT_DIR)/gps_conversion_unittest : \
$(OBJECT_DIR)/flight/gps_conversion.o \
$(OBJECT_DIR)/common/gps_conversion.o \
$(OBJECT_DIR)/gps_conversion_unittest.o \
$(OBJECT_DIR)/gtest_main.a
@ -359,7 +359,7 @@ $(OBJECT_DIR)/telemetry_hott_unittest.o : \
$(OBJECT_DIR)/telemetry_hott_unittest : \
$(OBJECT_DIR)/telemetry/hott.o \
$(OBJECT_DIR)/telemetry_hott_unittest.o \
$(OBJECT_DIR)/flight/gps_conversion.o \
$(OBJECT_DIR)/common/gps_conversion.o \
$(OBJECT_DIR)/gtest_main.a
$(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
@ -537,7 +537,7 @@ $(OBJECT_DIR)/telemetry_crsf_unittest : \
$(OBJECT_DIR)/telemetry_crsf_unittest.o \
$(OBJECT_DIR)/common/maths.o \
$(OBJECT_DIR)/common/streambuf.o \
$(OBJECT_DIR)/flight/gps_conversion.o \
$(OBJECT_DIR)/common/gps_conversion.o \
$(OBJECT_DIR)/fc/runtime_config.o \
$(OBJECT_DIR)/gtest_main.a

14
src/test/unit/telemetry_crsf_unittest.cc
View File

@ -28,30 +28,30 @@ extern "C" {
#include "common/axis.h"
#include "common/filter.h"
#include "common/gps_conversion.h"
#include "common/maths.h"
#include "config/parameter_group.h"
#include "config/parameter_group_ids.h"
#include "drivers/system.h"
#include "drivers/serial.h"
#include "drivers/system.h"
#include "fc/runtime_config.h"
#include "flight/pid.h"
#include "flight/imu.h"
#include "io/gps.h"
#include "io/serial.h"
#include "rx/crsf.h"
#include "sensors/sensors.h"
#include "sensors/battery.h"
#include "sensors/sensors.h"
#include "telemetry/telemetry.h"
#include "telemetry/crsf.h"
#include "flight/pid.h"
#include "flight/imu.h"
#include "flight/gps_conversion.h"
#include "telemetry/telemetry.h"
bool airMode;
uint16_t vbat;

20
src/test/unit/telemetry_hott_unittest.cc
View File

@ -27,24 +27,24 @@ extern "C" {
#include "build/debug.h"
#include "common/axis.h"
#include "common/gps_conversion.h"
#include "drivers/system.h"
#include "drivers/serial.h"
#include "drivers/system.h"
#include "sensors/sensors.h"
#include "sensors/battery.h"
#include "sensors/barometer.h"
#include "fc/runtime_config.h"
#include "flight/pid.h"
#include "io/serial.h"
#include "io/gps.h"
#include "io/serial.h"
#include "sensors/barometer.h"
#include "sensors/battery.h"
#include "sensors/sensors.h"
#include "telemetry/telemetry.h"
#include "telemetry/hott.h"
#include "flight/pid.h"
#include "flight/gps_conversion.h"
#include "fc/runtime_config.h"
}
#include "unittest_macros.h"