[build] fix test_all_confs

This commit is contained in:
Felix Ruess
2015-09-21 11:37:21 +02:00
parent cbae67bbe5
commit 26bf34a54e
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -319,8 +319,8 @@ test_examples: all
test_all_confs: all test_all_confs: all
$(Q)$(eval $CONFS:=$(shell ./find_confs.py)) $(Q)$(eval $CONFS:=$(shell ./find_confs.py))
@echo "Found $(words $($CONFS)) config files: $($CONFS)" @echo "************\nFound $(words $($CONFS)) config files: $($CONFS)"
$(Q)$(foreach conf,$($CONFS),echo "Testing all aircrafts in conf: $(conf)" && CONF_XML=$(conf) prove tests/examples/ ;) $(Q)$(foreach conf,$($CONFS),echo "\n************\nTesting all aircrafts in conf: $(conf)\n************" && (CONF_XML=$(conf) prove tests/examples/ || 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
# run some math tests that don't need whole paparazzi to be built # run some math tests that don't need whole paparazzi to be built
test_math: test_math:
+2 -2
View File
@@ -9,7 +9,7 @@ def find_conf_files(pprz_home, conf_dir, exclude_backups=True):
conf_files = [] conf_files = []
pattern = "*conf[._-]*xml" pattern = "*conf[._-]*xml"
backup_pattern = "*conf[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*" backup_pattern = "*conf[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*"
excludes = ["%gconf.xml"] excludes = ["conf/%gconf.xml", "conf/conf.xml"]
for path, subdirs, files in os.walk(conf_dir): for path, subdirs, files in os.walk(conf_dir):
for name in files: for name in files:
@@ -18,7 +18,7 @@ def find_conf_files(pprz_home, conf_dir, exclude_backups=True):
if fnmatch(name, pattern): if fnmatch(name, pattern):
filepath = os.path.join(path, name) filepath = os.path.join(path, name)
entry = os.path.relpath(filepath, pprz_home) entry = os.path.relpath(filepath, pprz_home)
if not os.path.islink(filepath) and name not in excludes: if not os.path.islink(filepath) and entry not in excludes:
conf_files.append(entry) conf_files.append(entry)
return conf_files return conf_files