[tests][ext] build opencv_bebop on make test_all_confs

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
+5 -2
View File
@@ -167,6 +167,9 @@ ext:
$(MAKE) -C $(EXT)
$(MAKE) -C $(TOOLS)/bluegiga_usb_dongle
opencv_bebop:
$(MAKE) -C $(EXT) opencv_bebop
#
# make misc subdirs
#
@@ -305,7 +308,7 @@ test: test_math test_examples
test_examples: all
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))
@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
@@ -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 \
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 \
test test_examples test_math test_sim test_all_confs