Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 20:38:27 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[tests] improve 01_compile_all_aircrafts.t

Browse Source 
- only fold arrays on 'name' for aircraft, firmware and target to not get warnings about none unique 'name' attribs for modules and subsytems
- if airframe file could not be parsed, show error at the end
This commit is contained in:
Felix Ruess
2015-12-19 13:17:28 +01:00
parent 1f23c3fdce
commit 8b6e82b1cd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/aircrafts/01_compile_all_aircrafts.t
+4 -3
View File
@@ -37,7 +37,8 @@ use IPC::Run qw( run );
use Cwd; use Cwd;
$|++; $|++;
my $xmlSimple = XML::Simple->new(ForceArray => 1); # make sure that all elements are arrays and only fold arrays on name for aircraft, firmware and target
my $xmlSimple = XML::Simple->new(ForceArray => 1, KeyAttr => {aircraft => 'name', firmware => 'name', target => 'name'});
my $conf_xml_file = $ENV{'CONF_XML'}; my $conf_xml_file = $ENV{'CONF_XML'};
if ($conf_xml_file eq "") { if ($conf_xml_file eq "") {
$conf_xml_file = "$ENV{'PAPARAZZI_HOME'}/conf/conf.xml"; $conf_xml_file = "$ENV{'PAPARAZZI_HOME'}/conf/conf.xml";
@@ -52,7 +53,7 @@ sub get_num_targets
{ {
my $airframe = $conf->{'aircraft'}->{$aircraft}->{'airframe'}; my $airframe = $conf->{'aircraft'}->{$aircraft}->{'airframe'};
my $airframe_config = eval { $xmlSimple->XMLin("$ENV{'PAPARAZZI_HOME'}/conf/$airframe") }; my $airframe_config = eval { $xmlSimple->XMLin("$ENV{'PAPARAZZI_HOME'}/conf/$airframe") };
warn $@ if ($@); warn "Parsing airframe $airframe: $@" if ($@);
foreach my $process (sort keys %{$airframe_config->{'firmware'}}) foreach my $process (sort keys %{$airframe_config->{'firmware'}})
{ {
foreach my $target (sort keys %{$airframe_config->{'firmware'}->{$process}->{'target'}}) foreach my $target (sort keys %{$airframe_config->{'firmware'}->{$process}->{'target'}})
@@ -76,7 +77,7 @@ foreach my $aircraft (sort keys%{$conf->{'aircraft'}})
if ($@) if ($@)
{ {
warn "Skipping aircraft $aircraft: $@"; warn "Skipping aircraft $aircraft: $@";
push @invalid_airframes, $airframe; push @invalid_airframes, "$airframe: $@";
} }
foreach my $process (sort keys %{$airframe_config->{'firmware'}}) foreach my $process (sort keys %{$airframe_config->{'firmware'}})
{ {