aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-12-25 09:48:15 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-12-25 09:48:15 +0100
commit25af4b266ca48b183a1ad375856396f67d6ab30f (patch)
tree64e031ec3747ab706e5ae8ed9fd052e12ee3248b /Makefile
parentad189cf7d69b8de16244b90d398e1d84ed6d0f4b (diff)
parent9b535f6553944f3468bbec9203301623412524ad (diff)
downloadpx4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.gz
px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.bz2
px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.zip
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts: .gitignore src/lib/uavcan
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 13 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 910b785a3..04737c3b3 100644
--- a/Makefile
+++ b/Makefile
@@ -245,6 +245,14 @@ generateuorbtopicheaders:
#
testbuild:
$(Q) (cd $(PX4_BASE) && $(MAKE) distclean && $(MAKE) archives && $(MAKE) -j8)
+ $(Q) (zip -r Firmware.zip $(PX4_BASE)/Images)
+
+#
+# Unittest targets. Builds and runs the host-level
+# unit tests.
+.PHONY: tests
+tests:
+ $(Q) (cd $(PX4_BASE)/unittests && $(MAKE) unittests)
#
# Cleanup targets. 'clean' should remove all built products and force
@@ -253,14 +261,14 @@ testbuild:
#
.PHONY: clean
clean:
- $(Q) $(RMDIR) $(BUILD_DIR)*.build
- $(Q) $(REMOVE) $(IMAGE_DIR)*.px4
+ $(Q) $(RMDIR) $(BUILD_DIR)*.build > /dev/null
+ $(Q) $(REMOVE) $(IMAGE_DIR)*.px4 > /dev/null
.PHONY: distclean
distclean: clean
- $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export
- $(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean
- $(Q) (cd $(NUTTX_SRC)/configs && $(FIND) . -maxdepth 1 -type l -delete)
+ $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export > /dev/null
+ $(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean > /dev/null
+ $(Q) (cd $(NUTTX_SRC)/configs && $(FIND) . -maxdepth 1 -type l -delete) > /dev/null
#
# Print some help text