From 143ff444e46a20709b1cd50cb732b3c5640d8ecd Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Wed, 7 Jan 2015 17:28:56 +0100 Subject: fix merge error of tests target change --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') 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) # -- cgit v1.2.3