[tests] use conf.xml and exit with number of failed tests

This commit is contained in:
Felix Ruess
2014-08-27 17:41:09 +02:00
parent b5470cb794
commit 4275468ef2
2 changed files with 4 additions and 3 deletions
+3 -2
View File
@@ -1,6 +1,7 @@
Q = @
PERL = /usr/bin/perl
TEST_VERBOSE = 0
TEST_JOBS ?= 1
NON_TEST_DIRS = lib|results
HARDWARE_REGEX = Lisa|Tiny|Umarim
HARDWARE_TEST_DIRS = $(shell find -L * -maxdepth 1 -type d | grep -Ev "$(NON_TEST_DIRS)" | grep -E "$(HARDWARE_REGEX)")
@@ -14,14 +15,14 @@ else
TEST_DIRECTORIES = $(NON_HARDWARE_TEST_DIRS) $(HARDWARE_TEST_DIRS)
endif
endif
TEST_FILES := $(shell ls $(TEST_DIRECTORIES:%=%/*.t))
TEST_FILES ?= $(shell ls $(TEST_DIRECTORIES:%=%/*.t))
ifneq ($(JUNIT),)
PERLENV=PERL_TEST_HARNESS_DUMP_TAP=$(PAPARAZZI_SRC)/tests/results
RUNTESTS=use TAP::Harness; TAP::Harness->new({ formatter_class => 'TAP::Formatter::JUnit', verbosity => $(TEST_VERBOSE), merge => 1, } )->runtests(qw($(TEST_FILES)))
else
PERLENV=
RUNTESTS=use TAP::Harness;TAP::Harness->new( { verbosity => $(TEST_VERBOSE) } )->runtests(qw($(TEST_FILES)))
RUNTESTS=use TAP::Harness; exit TAP::Harness->new( { verbosity => $(TEST_VERBOSE), jobs => $(TEST_JOBS) } )->runtests(qw($(TEST_FILES)))->failed
endif
test:
+1 -1
View File
@@ -8,7 +8,7 @@ use Data::Dumper;
use Config;
$|++;
my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/conf_tests.xml");
my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/conf.xml");
my $xmlSimple = XML::Simple->new(ForceArray => 1);
use Data::Dumper;