aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-07 17:28:56 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-07 17:28:56 +0100
commit143ff444e46a20709b1cd50cb732b3c5640d8ecd (patch)
treed9bd39cd7e2f436015aaba918c1aef24c7db6628 /Makefile
parent154111d4c011a9fd58812cb88fbbbbc38e30e08d (diff)
downloadpx4-firmware-143ff444e46a20709b1cd50cb732b3c5640d8ecd.tar.gz
px4-firmware-143ff444e46a20709b1cd50cb732b3c5640d8ecd.tar.bz2
px4-firmware-143ff444e46a20709b1cd50cb732b3c5640d8ecd.zip
fix merge error of tests target change
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6adbf765e..6480286d2 100644
--- a/Makefile
+++ b/Makefile
@@ -251,9 +251,7 @@ testbuild:
# Unittest targets. Builds and runs the host-level
# unit tests.
.PHONY: tests
-tests:
- $(Q) $(MAKE) generateuorbtopicheaders
- $(Q) (cd $(PX4_BASE)/unittests && $(MAKE) unittests)
+tests: generateuorbtopicheaders
$(Q) (mkdir -p $(PX4_BASE)/unittests/build && cd $(PX4_BASE)/unittests/build && cmake .. && $(MAKE) unittests)
#