From 4560128d18facbac0204e7c0d186a80f0fae6239 Mon Sep 17 00:00:00 2001 From: Bernard Davison Date: Thu, 21 Jun 2012 08:26:44 +1000 Subject: [PATCH] Commenting out the skipping of failing tests on Mac that were due to jsbsim for rotorcraft. --- tests/examples/01_compile_all_example_targets.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/examples/01_compile_all_example_targets.t b/tests/examples/01_compile_all_example_targets.t index bedf3521c7..680afe4aa9 100644 --- a/tests/examples/01_compile_all_example_targets.t +++ b/tests/examples/01_compile_all_example_targets.t @@ -28,7 +28,7 @@ foreach my $example (sort keys%{$examples->{'aircraft'}}) next unless scalar $airframe_config->{'firmware'}->{$process}->{'target'}->{$target}->{'board'}; # Exclude some builds on Mac as they are currently broken. - next if ( ($Config{'osname'} =~ m#darwin#i) and ($example =~ m#LisaLv11_Booz2v12_RC|LisaLv11_Aspirinv15_Overo_RC|Quad_LisaM_2|BOOZ2#i) and ($target =~ m#nps#i) ); + #next if ( ($Config{'osname'} =~ m#darwin#i) and ($example =~ m#LisaLv11_Booz2v12_RC|LisaLv11_Aspirinv15_Overo_RC|Quad_LisaM_2|BOOZ2#i) and ($target =~ m#nps#i) ); #warn "EXAMPLE: [$example] TARGET: [$target]\n"; my $make_options = "AIRCRAFT=$example clean_ac $target.compile"; @@ -48,7 +48,7 @@ foreach my $example (sort keys%{$examples->{'aircraft'}}) next unless scalar $airframe_config->{'firmware'}->{$process}->{$target}->{'board'}; # Exclude some builds on Mac as they are currently broken. - next if ( ($Config{'osname'} =~ m#darwin#i) and ($example =~ m#LisaLv11_Booz2v12_RC|LisaLv11_Aspirinv15_Overo_RC|Quad_LisaM_2|BOOZ2#i) and ($target =~ m#nps#i) ); + #next if ( ($Config{'osname'} =~ m#darwin#i) and ($example =~ m#LisaLv11_Booz2v12_RC|LisaLv11_Aspirinv15_Overo_RC|Quad_LisaM_2|BOOZ2#i) and ($target =~ m#nps#i) ); #warn "EXAMPLET: [$example] TARGET: [$target]\n"; my $make_options = "AIRCRAFT=$example clean_ac $target.compile"; @@ -97,7 +97,7 @@ sub run_program { if ($dont_fail_on_error) { - warn "Error: The command \"". $prog->last_command() ."\" failed to complete successfully. Exit status: $exit_status\n" if $verbose; + warn "Error: The command \"". $prog->last_command() ."\" failed to complete successfully. Exit status: $exit_status\n"; } else {