Cleaning up the reporting of example airframe compile test messages.

Fixing the linux find command issue.
Adding a check to see if the Ivy module will load and then skipping tests if it fails to load.
This commit is contained in:
Bernard Davison
2012-03-21 14:57:43 +11:00
parent a0899c7623
commit 406fe3f3cc
5 changed files with 36 additions and 27 deletions
@@ -31,13 +31,13 @@ foreach my $example (sort keys%{$examples->{'aircraft'}})
next if ( ($Config{'osname'} =~ m#darwin#i) and ($example =~ m#LISA_ASCTEC_PIOTR|LisaLv11_Booz2v12_RC|BOOZ2_A1#i) and ($target =~ m#sim#i) );
#warn "EXAMPLE: [$example] TARGET: [$target]\n";
my $make_upload_options = "AIRCRAFT=$example clean_ac $target.compile";
my $upload_output = run_program(
my $make_options = "AIRCRAFT=$example clean_ac $target.compile";
my $output = run_program(
"Attempting to build the firmware $target for the airframe $example.",
$ENV{'PAPARAZZI_SRC'},
"make $make_upload_options",
"make $make_options",
$ENV->{'TEST_VERBOSE'},1);
unlike($upload_output, '/\bError\b/i', "The upload output does not contain the word \"Error\"");
unlike($output, '/\bError\b/i', "The make output for the $example target $target does not contain the word \"Error\"");
}
}
elsif ($process =~ m#target#)
@@ -51,13 +51,13 @@ foreach my $example (sort keys%{$examples->{'aircraft'}})
next if ( ($Config{'osname'} =~ m#darwin#i) and ($example =~ m#LISA_ASCTEC_PIOTR|LisaLv11_Booz2v12_RC|BOOZ2_A1#i) and ($target =~ m#sim#i) );
#warn "EXAMPLET: [$example] TARGET: [$target]\n";
my $make_upload_options = "AIRCRAFT=$example clean_ac $target.compile";
my $upload_output = run_program(
my $make_options = "AIRCRAFT=$example clean_ac $target.compile";
my $output = run_program(
"Attempting to build the firmware $target for the airframe $example.",
$ENV{'PAPARAZZI_SRC'},
"make $make_upload_options",
"make $make_options",
$ENV->{'TEST_VERBOSE'},1);
unlike($upload_output, '/\bError\b/i', "The upload output does not contain the word \"Error\"");
unlike($output, '/\bError\b/i', "The make output for the $example target $target does not contain the word \"Error\"");
}
}
}