diff options
| author | Daniel Agar <daniel@agar.ca> | 2015-01-05 18:43:26 -0500 |
|---|---|---|
| committer | Daniel Agar <daniel@agar.ca> | 2015-01-05 18:43:26 -0500 |
| commit | 4a09e6370a9d730af001a3c5f2736e69e8c170c2 (patch) | |
| tree | 123760f16d7bc3fc7bfa776b48d975089a3ea262 /unittests | |
| parent | efb3240bd27fa037f9f68d21208453ab6361deca (diff) | |
| download | px4-firmware-4a09e6370a9d730af001a3c5f2736e69e8c170c2.tar.gz px4-firmware-4a09e6370a9d730af001a3c5f2736e69e8c170c2.tar.bz2 px4-firmware-4a09e6370a9d730af001a3c5f2736e69e8c170c2.zip | |
move sbus2_test to cmake
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | unittests/Makefile | 14 |
2 files changed, 8 insertions, 13 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index b4a4ec423..644609a10 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -20,7 +20,7 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure) function(add_gtest) foreach(test_name ${ARGN}) target_link_libraries(${test_name} gtest_main) - add_test(${test_name} ${test_name}) + add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) add_dependencies(check ${test_name}) endforeach() endfunction() @@ -45,5 +45,8 @@ add_gtest(mixer_test) add_executable(conversion_test conversion_test.cpp ${CMAKE_SOURCE_DIR}/../src/systemcmds/tests/test_conv.cpp) add_gtest(conversion_test) +# sbus2_test +add_executable(sbus2_test sbus2_test.cpp hrt.cpp) -# todo: add sbus2_test st24_test sf0x_test + +# todo: add st24_test sf0x_test diff --git a/unittests/Makefile b/unittests/Makefile index e1d2acacc..1d6db6817 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -40,11 +40,7 @@ gtest_main.a: gtest-all.o gtest_main.o $(AR) $(ARFLAGS) $@ $^ -all: sbus2_test st24_test sf0x_test - -SBUS2_FILES=../src/modules/px4iofirmware/sbus.c \ - hrt.cpp \ - sbus2_test.cpp +all: st24_test sf0x_test ST24_FILES=../src/lib/rc/st24.c \ hrt.cpp \ @@ -55,9 +51,6 @@ SF0X_FILES= \ sf0x_test.cpp \ ../src/drivers/sf0x/sf0x_parser.cpp -sbus2_test: $(SBUS2_FILES) - $(CC) -o sbus2_test $(SBUS2_FILES) $(CFLAGS) - sf0x_test: $(SF0X_FILES) $(CC) -o sf0x_test $(SF0X_FILES) $(CFLAGS) @@ -68,11 +61,10 @@ cmake_gtests: mkdir -p build cd build && CC=gcc cmake .. && $(MAKE) check -unittests: clean sbus2_test sf0x_test st24_test cmake_gtests - ./sbus2_test +unittests: clean sf0x_test st24_test cmake_gtests ./sf0x_test ./st24_test .PHONY: clean clean: - rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest sbus2_test st24_test sf0x_test build + rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest st24_test sf0x_test build |