diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-02 21:21:51 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-02 21:21:51 +0100 |
| commit | d441d38677eb78d1e599973dd1e993d3af1af218 (patch) | |
| tree | ddee78e259d301c551a734a9f75c12107b53c227 /unittests | |
| parent | 143508529feb10d5e767794b1fdd236d6915901b (diff) | |
| parent | e6a7dc7a3ffd4eb988e9039171f1460f656b28c8 (diff) | |
| download | px4-firmware-d441d38677eb78d1e599973dd1e993d3af1af218.tar.gz px4-firmware-d441d38677eb78d1e599973dd1e993d3af1af218.tar.bz2 px4-firmware-d441d38677eb78d1e599973dd1e993d3af1af218.zip | |
Merged master into ros
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | unittests/sbus2_test.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index ee99b5a41..a87c23be2 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -23,11 +23,14 @@ include_directories(${CMAKE_SOURCE_DIR}) include_directories(${PX_SRC}) include_directories(${PX_SRC}/modules) include_directories(${PX_SRC}/lib) +include_directories(${PX_SRC}/drivers) add_definitions(-D__EXPORT=) add_definitions(-D__PX4_TESTS) add_definitions(-Dnoreturn_function=) add_definitions(-Dmain_t=int) +add_definitions(-DERROR=-1) +add_definitions(-DOK=0) # check add_custom_target(unittests COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure) diff --git a/unittests/sbus2_test.cpp b/unittests/sbus2_test.cpp index ee4f3d1d6..15a21c86b 100644 --- a/unittests/sbus2_test.cpp +++ b/unittests/sbus2_test.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" TEST(SBUS2Test, SBUS2) { - char *filepath = "testdata/sbus2_r7008SB.txt"; + const char *filepath = "testdata/sbus2_r7008SB.txt"; FILE *fp; fp = fopen(filepath,"rt"); |