diff --git a/conf/conf.xml.example b/conf/conf.xml.example index 6554a44879..f604a460ef 100644 --- a/conf/conf.xml.example +++ b/conf/conf.xml.example @@ -89,4 +89,14 @@ settings="settings/settings_booz2.xml" gui_color="white" /> + diff --git a/tests/LisaL/02_With_aspirin_v1.5_and_overo.t b/tests/LisaL/02_With_aspirin_v1.5_and_overo.t index 80eb977f88..a1c948f670 100644 --- a/tests/LisaL/02_With_aspirin_v1.5_and_overo.t +++ b/tests/LisaL/02_With_aspirin_v1.5_and_overo.t @@ -9,18 +9,18 @@ $|++; #################### # Make the airframe -my $make_compile_options = "AIRCRAFT=LisaLv11_Booz2v12_RC clean_ac ap.compile"; +my $make_compile_options = "AIRCRAFT=LisaLv11_Aspirinv15_Overo_RC clean_ac ap.compile"; my $compile_output = run_program( "Attempting to build the firmware.", $ENV{'PAPARAZZI_SRC'}, "make $make_compile_options", 0,1); -unlike($compile_output, '/Aircraft \'LisaLv11_Booz2v12_RC\' not found in/', "The compile output does not contain the message \"Aircraft \'LisaLv11_Booz2v12_RC\' not found in\""); +unlike($compile_output, '/Aircraft \'LisaLv11_Aspirinv15_Overo_RC\' not found in/', "The compile output does not contain the message \"Aircraft \'LisaLv11_Aspirinv15_Overo_RC\' not found in\""); unlike($compile_output, '/\bError\b/i', "The compile output does not contain the word \"Error\""); #################### # Upload the airframe -my $make_upload_options = "AIRCRAFT=LisaLv11_Booz2v12_RC BOARD_SERIAL=LISA-L-000154 ap.upload"; +my $make_upload_options = "AIRCRAFT=LisaLv11_Aspirinv15_Overo_RC BOARD_SERIAL=LISA-L-000154 ap.upload"; my $upload_output = run_program( "Attempting to build and upload the firmware.", $ENV{'PAPARAZZI_SRC'},