From cf2c7ee24bfc22aa06d5a4a0e5c058aa6b5b8b0a Mon Sep 17 00:00:00 2001 From: Bernard Davison Date: Thu, 21 Jun 2012 20:37:27 +1000 Subject: [PATCH] Commenting out the building of the following targets on Mac which fail due to linux/joystick.h not being found: make AIRCRAFT=BOOZ2 clean_ac nps.compile make AIRCRAFT=LisaLv11_Aspirinv15_Overo_RC clean_ac nps.compile make AIRCRAFT=LisaLv11_Booz2v12_RC clean_ac nps.compile make AIRCRAFT=Quad_LisaM_2 clean_ac nps.compile --- tests/examples/01_compile_all_example_targets.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/examples/01_compile_all_example_targets.t b/tests/examples/01_compile_all_example_targets.t index 680afe4aa9..7aa2783725 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";