diff options
author | Daniel Agar <daniel@agar.ca> | 2015-01-05 18:18:47 -0500 |
---|---|---|
committer | Daniel Agar <daniel@agar.ca> | 2015-01-05 18:18:47 -0500 |
commit | 3efb1be48e7f5b3608a4bfef87a09748b3458c54 (patch) | |
tree | 015ff6448aa3d058db9b186cb553f3e9b83c70dc /unittests/Makefile | |
parent | e672fdbbd6087baa01b2b1d638c4e850b5eb6f5c (diff) | |
download | px4-firmware-3efb1be48e7f5b3608a4bfef87a09748b3458c54.tar.gz px4-firmware-3efb1be48e7f5b3608a4bfef87a09748b3458c54.tar.bz2 px4-firmware-3efb1be48e7f5b3608a4bfef87a09748b3458c54.zip |
move mixer_test and conversion_test to gtest
Diffstat (limited to 'unittests/Makefile')
-rw-r--r-- | unittests/Makefile | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/unittests/Makefile b/unittests/Makefile index 5faa50bb5..0c50b3814 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -40,18 +40,7 @@ gtest_main.a: gtest-all.o gtest_main.o $(AR) $(ARFLAGS) $@ $^ -all: mixer_test sbus2_test st24_test sf0x_test - -MIXER_FILES=../src/systemcmds/tests/test_mixer.cpp \ - ../src/systemcmds/tests/test_conv.cpp \ - ../src/modules/systemlib/mixer/mixer_simple.cpp \ - ../src/modules/systemlib/mixer/mixer_multirotor.cpp \ - ../src/modules/systemlib/mixer/mixer.cpp \ - ../src/modules/systemlib/mixer/mixer_group.cpp \ - ../src/modules/systemlib/mixer/mixer_load.c \ - ../src/modules/systemlib/pwm_limit/pwm_limit.c \ - hrt.cpp \ - mixer_test.cpp +all: sbus2_test st24_test sf0x_test SBUS2_FILES=../src/modules/px4iofirmware/sbus.c \ hrt.cpp \ @@ -66,9 +55,6 @@ SF0X_FILES= \ sf0x_test.cpp \ ../src/drivers/sf0x/sf0x_parser.cpp -mixer_test: $(MIXER_FILES) - $(CC) -o mixer_test $(MIXER_FILES) $(CFLAGS) - sbus2_test: $(SBUS2_FILES) $(CC) -o sbus2_test $(SBUS2_FILES) $(CFLAGS) @@ -82,12 +68,11 @@ cmake_gtests: mkdir -p build cd build && CC=gcc cmake .. && $(MAKE) && $(MAKE) test -unittests: clean mixer_test sbus2_test sf0x_test st24_test cmake_gtests - ./mixer_test +unittests: clean sbus2_test sf0x_test st24_test cmake_gtests ./sbus2_test ./sf0x_test ./st24_test .PHONY: clean clean: - rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest mixer_test sbus2_test st24_test sf0x_test build + rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest sbus2_test st24_test sf0x_test build |