Skip to content

Commit 4890011

Browse files
committed
autotest: fix ScriptingOSD test for non-SFML builds
- Remove --osd flag and customise_SITL_commandline as SFML may not be available - Remove SIM_SPEEDUP change that was only needed for visual testing - Remove ScriptingOSD from disabled_tests since the test now properly detects and handles missing OSD backend gracefully
1 parent 45f449f commit 4890011

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

Tools/autotest/arducopter.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14702,15 +14702,15 @@ def ScriptingOSD(self):
1470214702
# Install the OSD example script
1470314703
self.install_example_script_context('osd.lua')
1470414704

14705-
# Set all parameters and restart SITL with OSD enabled
14706-
# Note: OSD_TYPE=2 is SITL OSD which requires --enable-sfml --sitl-osd
14705+
# Set all parameters and restart SITL
14706+
# Note: OSD_TYPE=2 is SITL OSD which requires the binary to be built with
14707+
# --sitl-osd configure flag. The OSD window appears automatically when
14708+
# OSD_TYPE=2 is set and the binary has SITL OSD compiled in.
1470714709
self.set_parameters({
1470814710
"SCR_ENABLE": 1,
14709-
"OSD_TYPE": 2, # SITL OSD (requires SFML)
14710-
"SIM_SPEEDUP": 5, # Slow enough to see the OSD
14711+
"OSD_TYPE": 2, # SITL OSD (requires --sitl-osd at configure time)
1471114712
})
14712-
# Restart SITL with --osd flag to enable the OSD window
14713-
self.customise_SITL_commandline(["--osd"])
14713+
self.reboot_sitl()
1471414714

1471514715
# Wait for script to start
1471614716
self.delay_sim_time(3)
@@ -15958,7 +15958,6 @@ def disabled_tests(self):
1595815958
"SMART_RTL_EnterLeave": "Causes a panic",
1595915959
"SMART_RTL_Repeat": "Currently fails due to issue with loop detection",
1596015960
"RTLStoppingDistanceSpeed": "Currently fails due to vehicle going off-course",
15961-
"ScriptingOSD": "Requires SFML which is not available in CI",
1596215961
}
1596315962

1596415963

0 commit comments

Comments
 (0)