diff options
| author | Daniel Agar <daniel@agar.ca> | 2015-01-02 22:40:30 -0500 |
|---|---|---|
| committer | Daniel Agar <daniel@agar.ca> | 2015-01-02 23:05:47 -0500 |
| commit | c520119129c8815c3d79299917154bcec7a58707 (patch) | |
| tree | 4f7367b4ad0901517c56d215f96334ee61fef04d | |
| parent | 859185ac72877a305b3e08d98a6ace8ae8196c92 (diff) | |
| download | px4-firmware-c520119129c8815c3d79299917154bcec7a58707.tar.gz px4-firmware-c520119129c8815c3d79299917154bcec7a58707.tar.bz2 px4-firmware-c520119129c8815c3d79299917154bcec7a58707.zip | |
unittests Makefile call new cmake based unittests
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | unittests/Makefile | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 5328de009..9959229f5 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 e68570868..e9453cedd 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 |