yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

move st24_test to cmake and run tests from original unittests working directory

Browse Source
This commit is contained in:
Daniel Agar
2015-01-05 18:50:26 -05:00
parent 4a09e6370a
commit 322362d5e0
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
unittests/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ include_directories(${CMAKE_SOURCE_DIR}/../src/lib)
add_definitions(-D__EXPORT=)
set(CMAKE_C_FLAGS "-std=c99")
set(CMAKE_CXX_FLAGS "-std=c++11 -Wno-write-strings")
set(CMAKE_CXX_FLAGS "-std=c++11")
# check
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
@@ -46,7 +46,14 @@ add_executable(conversion_test conversion_test.cpp ${CMAKE_SOURCE_DIR}/../src/sy
add_gtest(conversion_test)
# sbus2_test
# TODO: move to gtest
add_executable(sbus2_test sbus2_test.cpp hrt.cpp)
add_gtest(sbus2_test)
# st24_test
# TODO: move to gtest
add_executable(st24_test st24_test.cpp hrt.cpp ${CMAKE_SOURCE_DIR}/../src/lib/rc/st24.c)
add_gtest(st24_test)
# todo: add st24_test sf0x_test
# todo: add sf0x_test

14
unittests/Makefile
View File

@@ -40,11 +40,7 @@ gtest_main.a: gtest-all.o gtest_main.o
$(AR) $(ARFLAGS) $@ $^
all: st24_test sf0x_test
ST24_FILES=../src/lib/rc/st24.c \
hrt.cpp \
st24_test.cpp
all: sf0x_test
SF0X_FILES= \
hrt.cpp \
@@ -54,17 +50,13 @@ SF0X_FILES= \
sf0x_test: $(SF0X_FILES)
$(CC) -o sf0x_test $(SF0X_FILES) $(CFLAGS)
st24_test: $(ST24_FILES)
$(CC) -o st24_test $(ST24_FILES) $(CFLAGS)
cmake_gtests:
mkdir -p build
cd build && CC=gcc cmake .. && $(MAKE) check
unittests: clean sf0x_test st24_test cmake_gtests
unittests: clean sf0x_test cmake_gtests
./sf0x_test
./st24_test
.PHONY: clean
clean:
rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest st24_test sf0x_test build
rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest sf0x_test build

2
unittests/mixer_test.cpp
View File

@@ -6,6 +6,6 @@
TEST(MixerTest, Mixer) {
char* args[] = {"empty", "../../ROMFS/px4fmu_common/mixers/IO_pass.mix", "../../ROMFS/px4fmu_common/mixers/FMU_quad_w.mix"};
char* args[] = {"empty", "../ROMFS/px4fmu_common/mixers/IO_pass.mix", "../ROMFS/px4fmu_common/mixers/FMU_quad_w.mix"};
ASSERT_EQ(test_mixer(3, args), 0) << "IO_pass.mix failed";
}