Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 18:07:25 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[tests][ext] build opencv_bebop on make test_all_confs

Browse Source
This commit is contained in:
Felix Ruess
2016-07-14 11:24:34 +02:00
parent a88161d10c
commit 229647ba37
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -2
View File
@@ -167,6 +167,9 @@ ext:
$(MAKE) -C $(EXT) $(MAKE) -C $(EXT)
$(MAKE) -C $(TOOLS)/bluegiga_usb_dongle $(MAKE) -C $(TOOLS)/bluegiga_usb_dongle
opencv_bebop:
$(MAKE) -C $(EXT) opencv_bebop
# #
# make misc subdirs # make misc subdirs
# #
@@ -305,7 +308,7 @@ test: test_math test_examples
test_examples: all test_examples: all
CONF_XML=conf/conf_tests.xml prove tests/aircrafts/ CONF_XML=conf/conf_tests.xml prove tests/aircrafts/
test_all_confs: all test_all_confs: all opencv_bebop
$(Q)$(eval $CONFS:=$(shell ./find_confs.py)) $(Q)$(eval $CONFS:=$(shell ./find_confs.py))
@echo "************\nFound $(words $($CONFS)) config files: $($CONFS)" @echo "************\nFound $(words $($CONFS)) config files: $($CONFS)"
$(Q)$(foreach conf,$($CONFS),echo "\n************\nTesting all aircrafts in conf: $(conf)\n************" && (CONF_XML=$(conf) prove tests/aircrafts/ || echo "failed $(conf)" >> TEST_ALL_CONFS_FAILED);) test -f TEST_ALL_CONFS_FAILED && cat TEST_ALL_CONFS_FAILED && rm -f TEST_ALL_CONFS_FAILED && exit 1; exit 0 $(Q)$(foreach conf,$($CONFS),echo "\n************\nTesting all aircrafts in conf: $(conf)\n************" && (CONF_XML=$(conf) prove tests/aircrafts/ || echo "failed $(conf)" >> TEST_ALL_CONFS_FAILED);) test -f TEST_ALL_CONFS_FAILED && cat TEST_ALL_CONFS_FAILED && rm -f TEST_ALL_CONFS_FAILED && exit 1; exit 0
@@ -322,6 +325,6 @@ test_sim: all
.PHONY: all print_build_version _print_building _save_build_version update_google_version init dox ground_segment ground_segment.opt \ .PHONY: all print_build_version _print_building _save_build_version update_google_version init dox ground_segment ground_segment.opt \
subdirs $(SUBDIRS) conf ext libpprz libpprzlink cockpit cockpit.opt tmtc tmtc.opt generators\ subdirs $(SUBDIRS) conf ext libpprz libpprzlink cockpit cockpit.opt tmtc tmtc.opt generators\
static sim_static lpctools commands \ static sim_static lpctools commands opencv_bebop\
clean cleanspaces ab_clean dist_clean distclean dist_clean_irreversible \ clean cleanspaces ab_clean dist_clean distclean dist_clean_irreversible \
test test_examples test_math test_sim test_all_confs test test_examples test_math test_sim test_all_confs
sw/ext/Makefile
+11 -3
View File
@@ -38,13 +38,13 @@ all: libopencm3 luftboot chibios fatfs libsbp mavlink
# update (and init if needed) all submodules # update (and init if needed) all submodules
update_submodules: update_submodules:
$(Q)if [ -d $(PAPARAZZI_SRC)/.git ]; then \ $(Q)if [ -d $(PAPARAZZI_SRC)/.git ]; then \
cd $(PAPARAZZI_SRC) && git submodule update --init; \ cd $(PAPARAZZI_SRC) && git submodule update --init --recursive; \
fi fi
# update (and init if needed) a specific submodule # update (and init if needed) a specific submodule
%.update: %.update:
$(Q)if [ -d $(PAPARAZZI_SRC)/.git ]; then \ $(Q)if [ -d $(PAPARAZZI_SRC)/.git ]; then \
cd $(PAPARAZZI_SRC) && git submodule update --init sw/ext/$*; \ cd $(PAPARAZZI_SRC) && git submodule update --init --recursive sw/ext/$*; \
fi fi
# only build currentl checkout of libopencm3 # only build currentl checkout of libopencm3
@@ -82,6 +82,11 @@ pprzlink: pprzlink.update pprzlink.build
pprzlink.build: pprzlink.build:
$(Q)$(MAKE) -C pprzlink $(Q)$(MAKE) -C pprzlink
opencv_bebop: opencv_bebop.update opencv_bebop.build
opencv_bebop.build:
$(Q)$(MAKE) -C opencv_bebop
clean: clean:
$(Q)if [ -f libopencm3/Makefile ]; then \ $(Q)if [ -f libopencm3/Makefile ]; then \
$(MAKE) -C $(EXT_DIR)/libopencm3 clean; \ $(MAKE) -C $(EXT_DIR)/libopencm3 clean; \
@@ -89,6 +94,9 @@ clean:
$(Q)if [ -f luftboot/src/Makefile ]; then \ $(Q)if [ -f luftboot/src/Makefile ]; then \
$(MAKE) -C luftboot/src clean; \ $(MAKE) -C luftboot/src clean; \
fi fi
$(Q)if [ -f opencv_bebop/Makefile ]; then \
$(MAKE) -C opencv_bebop clean; \
fi
.NOTPARALLEL: libopencm3 luftboot .NOTPARALLEL: libopencm3 luftboot
.PHONY: all clean update_submodules libopencm3 luftboot chibios fatfs luftboot_flash libopencm3.build luftboot.build mavlink.build .PHONY: all clean update_submodules libopencm3 luftboot chibios fatfs luftboot_flash libopencm3.build luftboot.build mavlink.build libsbp pprzlink pprzlink.build opencv_bebop opencv_bebop.build