From c520119129c8815c3d79299917154bcec7a58707 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 2 Jan 2015 22:40:30 -0500 Subject: [PATCH] unittests Makefile call new cmake based unittests --- .gitignore | 1 + unittests/Makefile | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5328de0098..9959229f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ tags .ropeproject *.orig Firmware.zip +unittests/build diff --git a/unittests/Makefile b/unittests/Makefile index e685708684..e9453ceddc 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -78,7 +78,11 @@ sf0x_test: $(SF0X_FILES) st24_test: $(ST24_FILES) $(CC) -o st24_test $(ST24_FILES) $(CFLAGS) -unittests: clean mixer_test sbus2_test sf0x_test st24_test +cmake_gtests: + mkdir -p build + cd build && cmake .. && $(MAKE) && $(MAKE) test + +unittests: clean mixer_test sbus2_test sf0x_test st24_test cmake_gtests ./mixer_test ./sbus2_test ./sf0x_test @@ -86,4 +90,4 @@ unittests: clean mixer_test sbus2_test sf0x_test st24_test .PHONY: clean clean: - rm -f gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest mixer_test sbus2_test st24_test sf0x_test + rm -rf gtest.a gtest_main.a *.o $(ODIR)/*.o *~ core $(INCDIR)/*~ sample_unittest mixer_test sbus2_test st24_test sf0x_test build